From c3c1d77e8e8d0ccab211e461c84b73062c7aeece Mon Sep 17 00:00:00 2001
From: integer <7279624+integerrr@users.noreply.github.com>
Date: Fri, 13 Jan 2023 23:07:59 +0000
Subject: [PATCH] make `PlayerSettingsGroup` expand on hover

---
 .../Screens/Play/HUD/PlayerSettingsOverlay.cs |  6 ++---
 .../PlayerSettings/PlayerSettingsGroup.cs     | 24 +++++++++++++++++++
 2 files changed, 26 insertions(+), 4 deletions(-)

diff --git a/osu.Game/Screens/Play/HUD/PlayerSettingsOverlay.cs b/osu.Game/Screens/Play/HUD/PlayerSettingsOverlay.cs
index 1edb227a75..019ba53a5e 100644
--- a/osu.Game/Screens/Play/HUD/PlayerSettingsOverlay.cs
+++ b/osu.Game/Screens/Play/HUD/PlayerSettingsOverlay.cs
@@ -16,7 +16,6 @@ namespace osu.Game.Screens.Play.HUD
     {
         private const int fade_duration = 200;
 
-
         public bool ReplayLoaded;
 
         public readonly PlaybackSettings PlaybackSettings;
@@ -42,13 +41,12 @@ namespace osu.Game.Screens.Play.HUD
                 {
                     //CollectionSettings = new CollectionSettings(),
                     //DiscussionSettings = new DiscussionSettings(),
-                    PlaybackSettings = new PlaybackSettings(),
-                    VisualSettings = new VisualSettings()
+                    PlaybackSettings = new PlaybackSettings { Expanded = { Value = false } },
+                    VisualSettings = new VisualSettings { Expanded = { Value = false } }
                 }
             };
         }
 
-
         protected override void PopIn() => this.FadeIn(fade_duration);
         protected override void PopOut() => this.FadeOut(fade_duration);
 
diff --git a/osu.Game/Screens/Play/PlayerSettings/PlayerSettingsGroup.cs b/osu.Game/Screens/Play/PlayerSettings/PlayerSettingsGroup.cs
index 6c6f62a8ac..63e081b2ea 100644
--- a/osu.Game/Screens/Play/PlayerSettings/PlayerSettingsGroup.cs
+++ b/osu.Game/Screens/Play/PlayerSettings/PlayerSettingsGroup.cs
@@ -4,6 +4,7 @@
 #nullable disable
 
 using osu.Framework.Input.Events;
+using osu.Framework.Threading;
 using osu.Game.Overlays;
 
 namespace osu.Game.Screens.Play.PlayerSettings
@@ -15,12 +16,35 @@ namespace osu.Game.Screens.Play.PlayerSettings
         {
         }
 
+        private ScheduledDelegate hoverExpandEvent;
+
         protected override bool OnHover(HoverEvent e)
         {
+            updateHoverExpansion();
             base.OnHover(e);
 
             // Importantly, return true to correctly take focus away from PlayerLoader.
             return true;
         }
+
+        protected override void OnHoverLost(HoverLostEvent e)
+        {
+            if (hoverExpandEvent == null) return;
+
+            hoverExpandEvent?.Cancel();
+            hoverExpandEvent = null;
+
+            Expanded.Value = false;
+
+            base.OnHoverLost(e);
+        }
+
+        private void updateHoverExpansion()
+        {
+            hoverExpandEvent?.Cancel();
+
+            if (IsHovered && !Expanded.Value)
+                hoverExpandEvent = Scheduler.AddDelayed(() => Expanded.Value = true, 0);
+        }
     }
 }