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

Merge branch 'master' into fix-TestCaseBeatmapCarousel

Browse Source
This commit is contained in:
Dean Herbert 2018-06-04 11:16:17 +09:00 committed by GitHub
commit 3ad0735a33
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
osu.Game/Screens/Play/PlayerSettings/PlayerSettingsGroup.cs
View File

@ -50,11 +50,11 @@ namespace osu.Game.Screens.Play.PlayerSettings
content.ResizeHeightTo(0, transition_duration, Easing.OutQuint); content.ResizeHeightTo(0, transition_duration, Easing.OutQuint);
} }
button.FadeColour(expanded ? buttonActiveColour : Color4.White, 200, Easing.OutQuint); updateExpanded();
} }
} }
private Color4 buttonActiveColour; private Color4 expandedColour;
protected PlayerSettingsGroup() protected PlayerSettingsGroup()
{ {
@ -130,9 +130,13 @@ namespace osu.Game.Screens.Play.PlayerSettings
[BackgroundDependencyLoader] [BackgroundDependencyLoader]
private void load(OsuColour colours) private void load(OsuColour colours)
{ {
button.Colour = buttonActiveColour = colours.Yellow; expandedColour = colours.Yellow;
updateExpanded();
} }
private void updateExpanded() => button.FadeColour(expanded ? expandedColour : Color4.White, 200, Easing.InOutQuint);
protected override Container<Drawable> Content => content; protected override Container<Drawable> Content => content;
protected override bool OnHover(InputState state) => true; protected override bool OnHover(InputState state) => true;