h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2024-09-23 07:27:24 +08:00
Code Issues Releases Wiki Activity

current_colour -> currentColour, fix masked away playlist items not fading colours

Browse Source
This commit is contained in:
DrabWeb 2017-04-09 09:08:11 -03:00
parent 70756a069e
commit fc7eef091f
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
osu.Game/Overlays/PlaylistController.cs
View File

@ -297,7 +297,7 @@ namespace osu.Game.Overlays
private class PlaylistItem : Container private class PlaylistItem : Container
{ {
private const float fade_duration = 100; private const float fade_duration = 100;
private Color4 current_colour; private Color4 currentColour;
private TextAwesome icon; private TextAwesome icon;
private readonly IEnumerable<OsuSpriteText> title, artist; private readonly IEnumerable<OsuSpriteText> title, artist;
@ -315,9 +315,9 @@ namespace osu.Game.Overlays
if (value == current) return; if (value == current) return;
current = value; current = value;
//todo: fading when masked away is broken Flush(true);
foreach (OsuSpriteText t in title) foreach (OsuSpriteText t in title)
t.FadeColour(Current ? current_colour : Color4.White, fade_duration); t.FadeColour(Current ? currentColour : Color4.White, fade_duration);
} }
} }
@ -382,7 +382,7 @@ namespace osu.Game.Overlays
t.Colour = colours.Gray9; t.Colour = colours.Gray9;
icon.Colour = colours.Gray5; icon.Colour = colours.Gray5;
current_colour = colours.Yellow; currentColour = colours.Yellow;
} }
protected override bool OnHover(Framework.Input.InputState state) protected override bool OnHover(Framework.Input.InputState state)