From a02556d2fa93e7ca6242ba614af42ab37cc05a53 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 17 Jan 2023 14:43:22 +0900
Subject: [PATCH] Move hover logic to `SettingsToolboxGroup` to avoid expanded
 state clash

---
 osu.Game/Overlays/SettingsToolboxGroup.cs      |  4 +++-
 .../Play/PlayerSettings/PlayerSettingsGroup.cs | 18 ------------------
 2 files changed, 3 insertions(+), 19 deletions(-)

diff --git a/osu.Game/Overlays/SettingsToolboxGroup.cs b/osu.Game/Overlays/SettingsToolboxGroup.cs
index 86964e7ed4..c0948c1eab 100644
--- a/osu.Game/Overlays/SettingsToolboxGroup.cs
+++ b/osu.Game/Overlays/SettingsToolboxGroup.cs
@@ -135,12 +135,14 @@ namespace osu.Game.Overlays
         protected override bool OnHover(HoverEvent e)
         {
             updateFadeState();
+            updateExpandedState(true);
             return false;
         }
 
         protected override void OnHoverLost(HoverLostEvent e)
         {
             updateFadeState();
+            updateExpandedState(true);
             base.OnHoverLost(e);
         }
 
@@ -168,7 +170,7 @@ namespace osu.Game.Overlays
             // potentially continuing to get processed while content has changed to autosize.
             content.ClearTransforms();
 
-            if (Expanded.Value)
+            if (Expanded.Value || IsHovered)
             {
                 content.AutoSizeAxes = Axes.Y;
                 content.AutoSizeDuration = animate ? transition_duration : 0;
diff --git a/osu.Game/Screens/Play/PlayerSettings/PlayerSettingsGroup.cs b/osu.Game/Screens/Play/PlayerSettings/PlayerSettingsGroup.cs
index ea4d983343..838106e198 100644
--- a/osu.Game/Screens/Play/PlayerSettings/PlayerSettingsGroup.cs
+++ b/osu.Game/Screens/Play/PlayerSettings/PlayerSettingsGroup.cs
@@ -1,8 +1,6 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using osu.Framework.Input.Events;
 using osu.Game.Overlays;
 
@@ -15,28 +13,12 @@ namespace osu.Game.Screens.Play.PlayerSettings
         {
         }
 
-        private bool expandedByDefault = true;
-
         protected override bool OnHover(HoverEvent e)
         {
-            if (IsHovered && !Expanded.Value)
-            {
-                Expanded.Value = true;
-                expandedByDefault = false;
-            }
-
             base.OnHover(e);
 
             // Importantly, return true to correctly take focus away from PlayerLoader.
             return true;
         }
-
-        protected override void OnHoverLost(HoverLostEvent e)
-        {
-            if (!expandedByDefault)
-                Expanded.Value = false;
-
-            base.OnHoverLost(e);
-        }
     }
 }