RepoMirrors/osu
1
0
Fork 0
mirror of https://github.com/ppy/osu synced 2025-04-01 22:48:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #175 from Tom94/fix-broken-option-checkbox

Browse Source 
Fix option checkbox losing its glow incorrectly in certain cases.
This commit is contained in:
Dean Herbert 2016-11-16 03:12:23 +09:00 committed by GitHub
commit da00c65e50
1 changed files with 16 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
osu.Game/Overlays/Options/CheckBoxOption.cs
View File

@ -92,13 +92,13 @@ namespace osu.Game.Overlays.Options
protected override bool OnHover(InputState state) protected override bool OnHover(InputState state)
{ {
light.TriggerHover(state); light.Glowing = true;
return base.OnHover(state); return base.OnHover(state);
} }
protected override void OnHoverLost(InputState state) protected override void OnHoverLost(InputState state)
{ {
light.TriggerHoverLost(state); light.Glowing = false;
base.OnHoverLost(state); base.OnHoverLost(state);
} }
@ -159,19 +159,21 @@ namespace osu.Game.Overlays.Options
}; };
} }
protected override bool OnHover(InputState state) public bool Glowing
{ {
FadeColour(hoverColour, 500, EasingTypes.OutQuint); set
FadeGlowTo(1, 500, EasingTypes.OutQuint); {
if (value)
return base.OnHover(state); {
} FadeColour(hoverColour, 500, EasingTypes.OutQuint);
FadeGlowTo(1, 500, EasingTypes.OutQuint);
protected override void OnHoverLost(InputState state) }
{ else
FadeGlowTo(0, 500); {
FadeColour(defaultColour, 500); FadeGlowTo(0, 500);
base.OnHoverLost(state); FadeColour(defaultColour, 500);
}
}
} }
private CheckBoxState state; private CheckBoxState state;