From 536925c77a51631ee8e3c69d99716f71cae3d43e Mon Sep 17 00:00:00 2001 From: DrabWeb Date: Thu, 2 Mar 2017 09:15:53 -0400 Subject: [PATCH] Comply to naming conventions --- osu.Game/Overlays/DragBar.cs | 14 +++++++------- osu.Game/Screens/Play/SongProgressBar.cs | 4 ++-- osu.Game/Screens/Play/SongProgressGraphColumn.cs | 6 +++--- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/osu.Game/Overlays/DragBar.cs b/osu.Game/Overlays/DragBar.cs index 44106d387a..908616ed6a 100644 --- a/osu.Game/Overlays/DragBar.cs +++ b/osu.Game/Overlays/DragBar.cs @@ -11,8 +11,8 @@ namespace osu.Game.Overlays { public class DragBar : Container { - protected Container fillContainer; - protected Box fill; + protected Container FillContainer; + protected Box Fill; public Action SeekRequested; private bool isDragging; @@ -25,7 +25,7 @@ namespace osu.Game.Overlays { enabled = value; if (!enabled) - fillContainer.Width = 0; + FillContainer.Width = 0; } } @@ -35,7 +35,7 @@ namespace osu.Game.Overlays Children = new Drawable[] { - fillContainer = new Container + FillContainer = new Container { Origin = Anchor.BottomLeft, Anchor = Anchor.BottomLeft, @@ -43,7 +43,7 @@ namespace osu.Game.Overlays Width = 0, Children = new Drawable[] { - fill = new Box + Fill = new Box { RelativeSizeAxes = Axes.Both } @@ -56,7 +56,7 @@ namespace osu.Game.Overlays { if (isDragging || !IsEnabled) return; - fillContainer.Width = position; + FillContainer.Width = position; } private void seek(InputState state) @@ -64,7 +64,7 @@ namespace osu.Game.Overlays if (!IsEnabled) return; float seekLocation = state.Mouse.Position.X / DrawWidth; SeekRequested?.Invoke(seekLocation); - fillContainer.Width = seekLocation; + FillContainer.Width = seekLocation; } protected override bool OnMouseDown(InputState state, MouseDownEventArgs args) diff --git a/osu.Game/Screens/Play/SongProgressBar.cs b/osu.Game/Screens/Play/SongProgressBar.cs index 9c6d46b79c..dc3a761742 100644 --- a/osu.Game/Screens/Play/SongProgressBar.cs +++ b/osu.Game/Screens/Play/SongProgressBar.cs @@ -19,7 +19,7 @@ namespace osu.Game.Screens.Play public SongProgressBar() { - fill.Colour = SongProgress.FILL_COLOUR; + Fill.Colour = SongProgress.FILL_COLOUR; Height = SongProgress.BAR_HEIGHT; Add(new Box @@ -29,7 +29,7 @@ namespace osu.Game.Screens.Play Alpha = 0.5f, Depth = 1 }); - fillContainer.Add(handle = new Container + FillContainer.Add(handle = new Container { Origin = Anchor.BottomRight, Anchor = Anchor.BottomRight, diff --git a/osu.Game/Screens/Play/SongProgressGraphColumn.cs b/osu.Game/Screens/Play/SongProgressGraphColumn.cs index a4a647f60c..e676007dc2 100644 --- a/osu.Game/Screens/Play/SongProgressGraphColumn.cs +++ b/osu.Game/Screens/Play/SongProgressGraphColumn.cs @@ -13,9 +13,9 @@ namespace osu.Game.Screens.Play public class SongProgressGraphColumn : Container { private int rows = 11; - private Color4 empty_colour = Color4.White.Opacity(50); - private Color4 lit_colour = SongProgress.FILL_COLOUR; - private Color4 dimmed_colour = Color4.White.Opacity(175); + private readonly Color4 empty_colour = Color4.White.Opacity(50); + private readonly Color4 lit_colour = SongProgress.FILL_COLOUR; + private readonly Color4 dimmed_colour = Color4.White.Opacity(175); private List drawableRows = new List();