From d2ced2ea79bcc2b574c29a30495cdb2bea763af0 Mon Sep 17 00:00:00 2001 From: smoogipooo Date: Mon, 5 Jun 2017 20:16:37 +0900 Subject: [PATCH] Update with framework changes. --- osu-framework | 2 +- osu.Game/Rulesets/Timing/Drawables/DrawableTimingChange.cs | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/osu-framework b/osu-framework index cfbfbe6329..150c805604 160000 --- a/osu-framework +++ b/osu-framework @@ -1 +1 @@ -Subproject commit cfbfbe63294b88bdcdfb92fd6ae69aa826ff62c4 +Subproject commit 150c80560480215b1081228b9ef757c21f24a32c diff --git a/osu.Game/Rulesets/Timing/Drawables/DrawableTimingChange.cs b/osu.Game/Rulesets/Timing/Drawables/DrawableTimingChange.cs index f554780a56..8c69c44235 100644 --- a/osu.Game/Rulesets/Timing/Drawables/DrawableTimingChange.cs +++ b/osu.Game/Rulesets/Timing/Drawables/DrawableTimingChange.cs @@ -120,8 +120,8 @@ namespace osu.Game.Rulesets.Timing.Drawables if (!Children.Any()) return; - float width = Children.Select(child => child.X + child.Width).Max() - RelativeChildOffset.X; - float height = Children.Select(child => child.Y + child.Height).Max() - RelativeChildOffset.Y; + float width = Children.Select(child => child.X + child.Width).Max() - RelativePositionOffset.X; + float height = Children.Select(child => child.Y + child.Height).Max() - RelativePositionOffset.Y; Size = new Vector2((autoSizingAxes & Axes.X) > 0 ? width : Size.X, (autoSizingAxes & Axes.Y) > 0 ? height : Size.Y);