From 333008e26d50ff0853c6dad981d20002ed4abd84 Mon Sep 17 00:00:00 2001 From: DrabWeb Date: Wed, 22 Mar 2017 08:59:44 -0300 Subject: [PATCH] Formatting --- osu.Desktop.VisualTests/Tests/TestCaseSongProgress.cs | 2 +- osu.Game/Screens/Play/SongProgressBar.cs | 5 +---- osu.Game/Screens/Play/SongProgressGraph.cs | 6 ++---- 3 files changed, 4 insertions(+), 9 deletions(-) diff --git a/osu.Desktop.VisualTests/Tests/TestCaseSongProgress.cs b/osu.Desktop.VisualTests/Tests/TestCaseSongProgress.cs index 037bc0754f..9038e198cb 100644 --- a/osu.Desktop.VisualTests/Tests/TestCaseSongProgress.cs +++ b/osu.Desktop.VisualTests/Tests/TestCaseSongProgress.cs @@ -11,7 +11,7 @@ namespace osu.Desktop.VisualTests.Tests { internal class TestCaseSongProgress : TestCase { - public override string Description => @"With real data"; + public override string Description => @"With (half)real data"; private SongProgress progress; diff --git a/osu.Game/Screens/Play/SongProgressBar.cs b/osu.Game/Screens/Play/SongProgressBar.cs index aa0e2a4bb0..18454c7200 100644 --- a/osu.Game/Screens/Play/SongProgressBar.cs +++ b/osu.Game/Screens/Play/SongProgressBar.cs @@ -7,7 +7,6 @@ using osu.Game.Overlays; using osu.Framework.Graphics.Containers; using osu.Framework.Graphics; using osu.Framework.Graphics.Sprites; -using osu.Framework.Graphics.Primitives; namespace osu.Game.Screens.Play { @@ -15,8 +14,6 @@ namespace osu.Game.Screens.Play { public static readonly Vector2 HANDLE_SIZE = new Vector2(14, 25); - private Container handle; - public SongProgressBar() { Fill.Colour = SongProgress.FILL_COLOUR; @@ -29,7 +26,7 @@ namespace osu.Game.Screens.Play Alpha = 0.5f, Depth = 1 }); - FillContainer.Add(handle = new Container + FillContainer.Add(new Container { Origin = Anchor.BottomRight, Anchor = Anchor.BottomRight, diff --git a/osu.Game/Screens/Play/SongProgressGraph.cs b/osu.Game/Screens/Play/SongProgressGraph.cs index f4bd21ae45..20934fab17 100644 --- a/osu.Game/Screens/Play/SongProgressGraph.cs +++ b/osu.Game/Screens/Play/SongProgressGraph.cs @@ -4,7 +4,6 @@ using OpenTK; using System.Collections.Generic; using osu.Framework.Graphics.Containers; -using System; namespace osu.Game.Screens.Play { @@ -85,8 +84,7 @@ namespace osu.Game.Screens.Play return; } - float step = (float)values.Count / (float)ColumnCount; - + float step = values.Count / ColumnCount; for (float i = 0; i < values.Count; i += step) { calculatedValues.Add(values[(int)i]); @@ -103,7 +101,7 @@ namespace osu.Game.Screens.Play columns.Add(new SongProgressGraphColumn { Position = new Vector2(x + 1, 0), - State = ColumnState.Dimmed + State = ColumnState.Dimmed, }); Add(columns[columns.Count - 1]);