h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2025-01-15 02:33:20 +08:00
Code Issues Releases Wiki Activity

Comply to naming conventions

Browse Source
This commit is contained in:
DrabWeb 2017-03-02 09:15:53 -04:00
parent 435e845067
commit 536925c77a
3 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
osu.Game/Overlays/DragBar.cs
View File

@ -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<float> 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)

4
osu.Game/Screens/Play/SongProgressBar.cs
View File

@ -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,

6
osu.Game/Screens/Play/SongProgressGraphColumn.cs
View File

@ -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<Box> drawableRows = new List<Box>();