h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2025-03-05 16:02:56 +08:00
Code Issues Releases Wiki Activity

Formatting

Browse Source
This commit is contained in:
DrabWeb 2017-03-23 07:24:43 -03:00
parent 3923892863
commit ca2816f9c8
3 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
osu.Game/Modes/UI/StandardHudOverlay.cs
View File

@ -57,7 +57,7 @@ namespace osu.Game.Modes.UI
Origin = Anchor.BottomLeft, Origin = Anchor.BottomLeft,
RelativeSizeAxes = Axes.X, RelativeSizeAxes = Axes.X,
Depth = -2, //todo: find out why this doesn't put progress on top of PauseOverlay Depth = -2, //todo: find out why this doesn't put progress on top of PauseOverlay
Values = new int[] { 3 }, //todo: removeme Values = new[] { 3 }, //todo: removeme
}; };
} }
} }

16
osu.Game/Screens/Play/SongProgress.cs
View File

@ -13,14 +13,14 @@ namespace osu.Game.Screens.Play
{ {
public class SongProgress : OverlayContainer public class SongProgress : OverlayContainer
{ {
private readonly int bar_height = 5; private const int bar_height = 5;
private readonly int graph_height = 34; private const int graph_height = 34;
private readonly Vector2 handle_size = new Vector2(14, 25); private readonly Vector2 handleSize = new Vector2(14, 25);
private readonly Color4 fill_colour = new Color4(221, 255, 255, 255); private readonly Color4 fillColour = new Color4(221, 255, 255, 255);
private const float transition_duration = 200; private const float transition_duration = 200;
private SongProgressBar bar; private readonly SongProgressBar bar;
private SongProgressGraph graph; private readonly SongProgressGraph graph;
public Action<double> OnSeek; public Action<double> OnSeek;
@ -55,7 +55,7 @@ namespace osu.Game.Screens.Play
public SongProgress() public SongProgress()
{ {
RelativeSizeAxes = Axes.X; RelativeSizeAxes = Axes.X;
Height = bar_height + graph_height + SongProgressGraph.Column.HEIGHT + handle_size.Y; Height = bar_height + graph_height + SongProgressGraph.Column.HEIGHT + handleSize.Y;
Children = new Drawable[] Children = new Drawable[]
{ {
@ -70,7 +70,7 @@ namespace osu.Game.Screens.Play
Bottom = bar_height Bottom = bar_height
} }
}, },
bar = new SongProgressBar(bar_height + graph_height, handle_size, fill_colour) bar = new SongProgressBar(bar_height + graph_height, handleSize, fillColour)
{ {
Origin = Anchor.BottomCentre, Origin = Anchor.BottomCentre,
Anchor = Anchor.BottomCentre, Anchor = Anchor.BottomCentre,

2
osu.Game/Screens/Play/SongProgressGraph.cs
View File

@ -88,7 +88,7 @@ namespace osu.Game.Screens.Play
} }
/// <summary> /// <summary>
/// Takes <see cref="Values"> and adjusts it to fit the amount of columns. /// Takes <see cref="Values"/> and adjusts it to fit the amount of columns.
/// </summary> /// </summary>
private void recalculateValues() private void recalculateValues()
{ {