From 66865c50ad00163b4cfd0fdbd417306c04bbb526 Mon Sep 17 00:00:00 2001 From: Dean Herbert Date: Tue, 18 Apr 2017 18:10:01 +0900 Subject: [PATCH] Remove explicit RelativeSize setting. --- osu.Desktop.VisualTests/Tests/TestCaseSongProgress.cs | 1 + osu.Game/Rulesets/UI/StandardHudOverlay.cs | 2 +- osu.Game/Screens/Play/SongProgress.cs | 3 +-- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/osu.Desktop.VisualTests/Tests/TestCaseSongProgress.cs b/osu.Desktop.VisualTests/Tests/TestCaseSongProgress.cs index a75d70acaf..68391d9236 100644 --- a/osu.Desktop.VisualTests/Tests/TestCaseSongProgress.cs +++ b/osu.Desktop.VisualTests/Tests/TestCaseSongProgress.cs @@ -23,6 +23,7 @@ namespace osu.Desktop.VisualTests.Tests Add(progress = new SongProgress { + RelativeSizeAxes = Axes.X, AudioClock = new StopwatchClock(true), Anchor = Anchor.BottomLeft, Origin = Anchor.BottomLeft, diff --git a/osu.Game/Rulesets/UI/StandardHudOverlay.cs b/osu.Game/Rulesets/UI/StandardHudOverlay.cs index 2e2cb739f5..8c29b1ab3b 100644 --- a/osu.Game/Rulesets/UI/StandardHudOverlay.cs +++ b/osu.Game/Rulesets/UI/StandardHudOverlay.cs @@ -57,7 +57,7 @@ namespace osu.Game.Rulesets.UI Position = new Vector2(0, 30), }; - protected override SongProgress CreateProgress() => new SongProgress() + protected override SongProgress CreateProgress() => new SongProgress { Anchor = Anchor.BottomLeft, Origin = Anchor.BottomLeft, diff --git a/osu.Game/Screens/Play/SongProgress.cs b/osu.Game/Screens/Play/SongProgress.cs index 33acc998d6..bd29065560 100644 --- a/osu.Game/Screens/Play/SongProgress.cs +++ b/osu.Game/Screens/Play/SongProgress.cs @@ -4,7 +4,6 @@ using OpenTK; using osu.Framework.Graphics; using osu.Framework.Graphics.Containers; -using osu.Framework.Graphics.Primitives; using System; using System.Collections.Generic; using osu.Game.Graphics; @@ -13,6 +12,7 @@ using System.Linq; using osu.Framework.Timing; using osu.Game.Rulesets.Objects; using osu.Game.Rulesets.Objects.Types; +using osu.Framework.Graphics.Primitives; namespace osu.Game.Screens.Play { @@ -71,7 +71,6 @@ namespace osu.Game.Screens.Play public SongProgress() { - RelativeSizeAxes = Axes.X; Height = progress_height + SongProgressGraph.Column.HEIGHT + handle_size.Y; Y = progress_height;