From e5204e565dae9946543ca23c72119be7f26e0540 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 10 May 2022 17:23:12 +0900
Subject: [PATCH] Move horizontal padding to content level to better align
 scrollbar

---
 .../FirstRunSetup/FirstRunSetupScreen.cs      | 34 +++++++++++--------
 osu.Game/Overlays/FirstRunSetupOverlay.cs     |  6 +---
 2 files changed, 21 insertions(+), 19 deletions(-)

diff --git a/osu.Game/Overlays/FirstRunSetup/FirstRunSetupScreen.cs b/osu.Game/Overlays/FirstRunSetup/FirstRunSetupScreen.cs
index 1f18d181cb..2990948199 100644
--- a/osu.Game/Overlays/FirstRunSetup/FirstRunSetupScreen.cs
+++ b/osu.Game/Overlays/FirstRunSetup/FirstRunSetupScreen.cs
@@ -33,23 +33,29 @@ namespace osu.Game.Overlays.FirstRunSetup
                 new OsuScrollContainer(Direction.Vertical)
                 {
                     RelativeSizeAxes = Axes.Both,
-                    ScrollbarOverlapsContent = false,
-                    Children = new Drawable[]
+                    Masking = false,
+                    Child = new Container
                     {
-                        new OsuSpriteText
+                        RelativeSizeAxes = Axes.X,
+                        AutoSizeAxes = Axes.Y,
+                        Padding = new MarginPadding { Horizontal = 30 },
+                        Children = new Drawable[]
                         {
-                            Text = this.GetLocalisableDescription(),
-                            Font = OsuFont.Default.With(size: header_size),
-                            Colour = OverlayColourProvider.Light1,
+                            new OsuSpriteText
+                            {
+                                Text = this.GetLocalisableDescription(),
+                                Font = OsuFont.Default.With(size: header_size),
+                                Colour = OverlayColourProvider.Light1,
+                            },
+                            Content = new FillFlowContainer
+                            {
+                                Y = header_size + spacing,
+                                Spacing = new Vector2(spacing),
+                                RelativeSizeAxes = Axes.X,
+                                AutoSizeAxes = Axes.Y,
+                                Direction = FillDirection.Vertical,
+                            }
                         },
-                        Content = new FillFlowContainer
-                        {
-                            Y = header_size + spacing,
-                            Spacing = new Vector2(spacing),
-                            RelativeSizeAxes = Axes.X,
-                            AutoSizeAxes = Axes.Y,
-                            Direction = FillDirection.Vertical,
-                        }
                     },
                 }
             };
diff --git a/osu.Game/Overlays/FirstRunSetupOverlay.cs b/osu.Game/Overlays/FirstRunSetupOverlay.cs
index befa80e839..19a4c09473 100644
--- a/osu.Game/Overlays/FirstRunSetupOverlay.cs
+++ b/osu.Game/Overlays/FirstRunSetupOverlay.cs
@@ -118,11 +118,7 @@ namespace osu.Game.Overlays
                                         new Container
                                         {
                                             RelativeSizeAxes = Axes.Both,
-                                            Padding = new MarginPadding
-                                            {
-                                                Vertical = 20,
-                                                Horizontal = 20,
-                                            },
+                                            Padding = new MarginPadding { Vertical = 20 },
                                             Child = screenContent = new Container { RelativeSizeAxes = Axes.Both, },
                                         },
                                     },