sim1222/osukey
1
1
Fork 0
mirror of https://github.com/osukey/osukey.git synced 2025-08-08 00:53:56 +09:00
Code Issues Packages Projects Releases Wiki Activity

Handle hover blocking in VolumeOverlay to ensure correct hide scheduling

Browse Source
This commit is contained in:
Dean Herbert
2018-06-13 16:46:48 +09:00
parent 2a18625b2c
commit a55bf82fd9
2 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
osu.Game/Overlays/Volume/VolumeMeter.cs
View File

@ -221,7 +221,7 @@ namespace osu.Game.Overlays.Volume
protected override bool OnHover(InputState state) protected override bool OnHover(InputState state)
{ {
this.ScaleTo(1.04f, transition_length, Easing.OutExpo); this.ScaleTo(1.04f, transition_length, Easing.OutExpo);
return true; return false;
} }
protected override void OnHoverLost(InputState state) protected override void OnHoverLost(InputState state)

9
osu.Game/Overlays/VolumeOverlay.cs
View File

@ -142,13 +142,18 @@ namespace osu.Game.Overlays
return base.OnMouseMove(state); return base.OnMouseMove(state);
} }
protected override bool OnHover(InputState state)
{
Show();
return true;
}
private void schedulePopOut() private void schedulePopOut()
{ {
popOutDelegate?.Cancel(); popOutDelegate?.Cancel();
this.Delay(1000).Schedule(() => this.Delay(1000).Schedule(() =>
{ {
// only actually hide if the mouse isn't within our bounds. if (!IsHovered)
if (!ScreenSpaceDrawQuad.Contains(GetContainingInputManager().CurrentState.Mouse.Position))
Hide(); Hide();
}, out popOutDelegate); }, out popOutDelegate);
} }