h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2025-01-13 16:32:54 +08:00
Code Issues Releases Wiki Activity

make expansion to not use scheduler

Browse Source
This commit is contained in:
integer 2023-01-14 21:18:51 +00:00
parent 2831db53f7
commit a68d4fe5d1
1 changed files with 8 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -4,7 +4,6 @@
#nullable disable
using osu.Framework.Input.Events;
using osu.Framework.Threading;
using osu.Game.Overlays;
namespace osu.Game.Screens.Play.PlayerSettings
@ -16,11 +15,16 @@ namespace osu.Game.Screens.Play.PlayerSettings
{
}
private ScheduledDelegate hoverExpandEvent;
private bool expandedByDefault = true;
protected override bool OnHover(HoverEvent e)
{
updateHoverExpansion();
if (IsHovered && !Expanded.Value)
{
Expanded.Value = true;
expandedByDefault = false;
}
base.OnHover(e);
// Importantly, return true to correctly take focus away from PlayerLoader.
@ -29,23 +33,10 @@ namespace osu.Game.Screens.Play.PlayerSettings
protected override void OnHoverLost(HoverLostEvent e)
{
if (hoverExpandEvent != null)
{
hoverExpandEvent?.Cancel();
hoverExpandEvent = null;
if (!expandedByDefault)
Expanded.Value = false;
}
base.OnHoverLost(e);
}
private void updateHoverExpansion()
{
hoverExpandEvent?.Cancel();
if (IsHovered && !Expanded.Value)
hoverExpandEvent = Scheduler.AddDelayed(() => Expanded.Value = true, 0);
}
}
}