From b33935e39225104f740fc4c9611f4d5cd13f44d3 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 13 Oct 2022 17:12:28 +0900
Subject: [PATCH] Fix player loading screen settings scaling in

This always looked weird, and from the looks of the structure was
probably unintentional from the start (it is in the logo tracking
container for whatever reason).
---
 osu.Game/Screens/Play/PlayerLoader.cs | 51 +++++++++++++++------------
 1 file changed, 28 insertions(+), 23 deletions(-)

diff --git a/osu.Game/Screens/Play/PlayerLoader.cs b/osu.Game/Screens/Play/PlayerLoader.cs
index 2d096f1c38..0065520268 100644
--- a/osu.Game/Screens/Play/PlayerLoader.cs
+++ b/osu.Game/Screens/Play/PlayerLoader.cs
@@ -64,6 +64,8 @@ namespace osu.Game.Screens.Play
 
         protected Task? DisposalTask { get; private set; }
 
+        private OsuScrollContainer settingsScroll = null!;
+
         private bool backgroundBrightnessReduction;
 
         private readonly BindableDouble volumeAdjustment = new BindableDouble(1);
@@ -168,30 +170,30 @@ namespace osu.Game.Screens.Play
                         Anchor = Anchor.Centre,
                         Origin = Anchor.Centre,
                     },
-                    new OsuScrollContainer
-                    {
-                        Anchor = Anchor.TopRight,
-                        Origin = Anchor.TopRight,
-                        RelativeSizeAxes = Axes.Y,
-                        Width = SettingsToolboxGroup.CONTAINER_WIDTH + padding * 2,
-                        Padding = new MarginPadding { Vertical = padding },
-                        Masking = false,
-                        Child = PlayerSettings = new FillFlowContainer<PlayerSettingsGroup>
-                        {
-                            AutoSizeAxes = Axes.Both,
-                            Direction = FillDirection.Vertical,
-                            Spacing = new Vector2(0, 20),
-                            Padding = new MarginPadding { Horizontal = padding },
-                            Children = new PlayerSettingsGroup[]
-                            {
-                                VisualSettings = new VisualSettings(),
-                                AudioSettings = new AudioSettings(),
-                                new InputSettings()
-                            }
-                        },
-                    },
-                    idleTracker = new IdleTracker(750),
                 }),
+                settingsScroll = new OsuScrollContainer
+                {
+                    Anchor = Anchor.TopRight,
+                    Origin = Anchor.TopRight,
+                    RelativeSizeAxes = Axes.Y,
+                    Width = SettingsToolboxGroup.CONTAINER_WIDTH + padding * 2,
+                    Padding = new MarginPadding { Vertical = padding },
+                    Masking = false,
+                    Child = PlayerSettings = new FillFlowContainer<PlayerSettingsGroup>
+                    {
+                        AutoSizeAxes = Axes.Both,
+                        Direction = FillDirection.Vertical,
+                        Spacing = new Vector2(0, 20),
+                        Padding = new MarginPadding { Horizontal = padding },
+                        Children = new PlayerSettingsGroup[]
+                        {
+                            VisualSettings = new VisualSettings(),
+                            AudioSettings = new AudioSettings(),
+                            new InputSettings()
+                        }
+                    },
+                },
+                idleTracker = new IdleTracker(750),
                 lowPassFilter = new AudioFilter(audio.TrackMixer),
                 highPassFilter = new AudioFilter(audio.TrackMixer, BQFType.HighPass)
             };
@@ -392,6 +394,8 @@ namespace osu.Game.Screens.Play
         {
             MetadataInfo.Loading = true;
 
+            settingsScroll.FadeInFromZero(400);
+
             content.FadeInFromZero(400);
             content.ScaleTo(1, 650, Easing.OutQuint).Then().Schedule(prepareNewPlayer);
             lowPassFilter.CutoffTo(1000, 650, Easing.OutQuint);
@@ -407,6 +411,7 @@ namespace osu.Game.Screens.Play
 
             content.ScaleTo(0.7f, CONTENT_OUT_DURATION * 2, Easing.OutQuint);
             content.FadeOut(CONTENT_OUT_DURATION, Easing.OutQuint);
+            settingsScroll.FadeOut(CONTENT_OUT_DURATION, Easing.OutQuint);
             lowPassFilter.CutoffTo(AudioFilter.MAX_LOWPASS_CUTOFF, CONTENT_OUT_DURATION);
             highPassFilter.CutoffTo(0, CONTENT_OUT_DURATION);
         }