h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2024-12-15 01:52:55 +08:00
Code Issues Releases Wiki Activity

Fix for the fix

Browse Source
This commit is contained in:
DrabWeb 2017-03-23 08:32:24 -03:00
parent bbca6cf602
commit 3364801221
2 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -93,14 +93,14 @@ namespace osu.Game.Screens.Play
bar.IsEnabled = true; bar.IsEnabled = true;
updateProgress(); //in case progress was changed while the bar was hidden updateProgress(); //in case progress was changed while the bar was hidden
bar.FadeTo(1f, transition_duration, EasingTypes.In); bar.FadeIn(transition_duration, EasingTypes.In);
MoveTo(Vector2.Zero, transition_duration, EasingTypes.In); MoveTo(Vector2.Zero, transition_duration, EasingTypes.In);
} }
protected override void PopOut() protected override void PopOut()
{ {
bar.IsEnabled = false; bar.IsEnabled = false;
bar.FadeTo(0f, transition_duration, EasingTypes.In); bar.FadeOut(transition_duration, EasingTypes.In);
MoveTo(new Vector2(0f, bar_height), transition_duration, EasingTypes.In); MoveTo(new Vector2(0f, bar_height), transition_duration, EasingTypes.In);
} }
} }

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

@ -151,7 +151,7 @@ namespace osu.Game.Screens.Play
private const float cube_size = 4; private const float cube_size = 4;
private const float padding = 2; private const float padding = 2;
public const float WIDTH = cube_size + padding; public const float WIDTH = cube_size + padding;
public const float HEIGHT = cube_count * WIDTH; public const float HEIGHT = (cube_count * WIDTH) + padding + 1;
private readonly List<Box> drawableRows = new List<Box>(); private readonly List<Box> drawableRows = new List<Box>();
@ -184,7 +184,6 @@ namespace osu.Game.Screens.Play
public Column() public Column()
{ {
Size = new Vector2(WIDTH, HEIGHT); Size = new Vector2(WIDTH, HEIGHT);
Margin = new MarginPadding { Bottom = 1 }; //todo: probably find a better fix, not quite sure why this works
for (int r = 0; r < cube_count; r++) for (int r = 0; r < cube_count; r++)
{ {
@ -192,7 +191,7 @@ namespace osu.Game.Screens.Play
{ {
EdgeSmoothness = new Vector2(padding / 4), EdgeSmoothness = new Vector2(padding / 4),
Size = new Vector2(cube_size), Size = new Vector2(cube_size),
Position = new Vector2(0, r * WIDTH), Position = new Vector2(0, r * WIDTH + padding),
}); });
Add(drawableRows[drawableRows.Count - 1]); Add(drawableRows[drawableRows.Count - 1]);