Fix player settings no longer collapsing correctly

Regressed with ppy#33621 for obvious
reasons. Tachyon doing its job, caught this before hitting a proper
release.

Author: peppy

osu.Game.Tests/Visual/Gameplay/TestSceneReplayPlayer.cs

@@ -12,6 +12,7 @@
 using osu.Game.Rulesets.Osu.Replays;
 using osu.Game.Scoring;
 using osu.Game.Screens.Play;
+using osu.Game.Screens.Play.HUD;
 using osu.Game.Tests.Beatmaps;
 using osu.Game.Tests.Resources;
 using osuTK;
@@ -192,6 +193,20 @@ public void TestReplayDoesNotFailUntilRunningOutOfFrames()
             AddAssert("player failed after 10000", () => Player.GameplayClockContainer.CurrentTime, () => Is.GreaterThanOrEqualTo(10000));
         }
 
+        [Test]
+        public void TestPlayerLoaderSettingsHover()
+        {
+            loadPlayerWithBeatmap();
+
+            AddUntilStep("wait for settings overlay hidden", () => settingsOverlay().Expanded.Value, () => Is.False);
+            AddStep("move mouse to right of screen", () => InputManager.MoveMouseTo(Player.ScreenSpaceDrawQuad.TopRight));
+            AddUntilStep("wait for settings overlay visible", () => settingsOverlay().Expanded.Value, () => Is.True);
+            AddStep("move mouse to centre of screen", () => InputManager.MoveMouseTo(Player.ScreenSpaceDrawQuad.Centre));
+            AddUntilStep("wait for settings overlay hidden", () => settingsOverlay().Expanded.Value, () => Is.False);
+
+            PlayerSettingsOverlay settingsOverlay() => Player.ChildrenOfType<PlayerSettingsOverlay>().Single();
+        }
+
         private void loadPlayerWithBeatmap(IBeatmap? beatmap = null)
         {
             AddStep("create player", () =>

osu.Game/Graphics/Containers/ExpandingContainer.cs

@@ -1,7 +1,6 @@
 // Copyright (c) ppy Pty Ltd <[email protected]>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
@@ -41,24 +40,20 @@ protected ExpandingContainer(float contractedWidth, float expandedWidth)
             RelativeSizeAxes = Axes.Y;
             Width = contractedWidth;
 
-            FillFlow = new FillFlowContainer
-            {
-                Origin = Anchor.CentreLeft,
-                Anchor = Anchor.CentreLeft,
-                RelativeSizeAxes = Axes.X,
-                AutoSizeAxes = Axes.Y,
-                Direction = FillDirection.Vertical,
-            };
-        }
-
-        [BackgroundDependencyLoader]
-        private void load()
-        {
             InternalChild = CreateScrollContainer().With(s =>
             {
                 s.RelativeSizeAxes = Axes.Both;
                 s.ScrollbarVisible = false;
-            }).WithChild(FillFlow);
+            }).WithChild(
+                FillFlow = new FillFlowContainer
+                {
+                    Origin = Anchor.CentreLeft,
+                    Anchor = Anchor.CentreLeft,
+                    RelativeSizeAxes = Axes.X,
+                    AutoSizeAxes = Axes.Y,
+                    Direction = FillDirection.Vertical,
+                }
+            );
         }
 
         protected virtual OsuScrollContainer CreateScrollContainer() => new OsuScrollContainer();