From bcce9c5e6772911ff817216c4424ad0ff596e7a1 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 10 May 2022 17:01:36 +0900
Subject: [PATCH] Limit the width of first run overlay content

---
 osu.Game/Overlays/FirstRunSetupOverlay.cs | 67 ++++++++++++++---------
 1 file changed, 41 insertions(+), 26 deletions(-)

diff --git a/osu.Game/Overlays/FirstRunSetupOverlay.cs b/osu.Game/Overlays/FirstRunSetupOverlay.cs
index df1e094114b0..befa80e83915 100644
--- a/osu.Game/Overlays/FirstRunSetupOverlay.cs
+++ b/osu.Game/Overlays/FirstRunSetupOverlay.cs
@@ -62,7 +62,7 @@ public class FirstRunSetupOverlay : ShearedOverlayContainer
             typeof(ScreenBehaviour),
         };
 
-        private Container stackContainer = null!;
+        private Container screenContent = null!;
 
         private Bindable<OverlayActivation>? overlayActivationMode;
 
@@ -86,36 +86,51 @@ private void load(OsuColour colours)
                     Anchor = Anchor.Centre,
                     Origin = Anchor.Centre,
                     RelativeSizeAxes = Axes.Both,
-                    Padding = new MarginPadding
+                    Padding = new MarginPadding { Bottom = 20, },
+                    Child = new GridContainer()
                     {
-                        Horizontal = 70 * 1.2f,
-                        Bottom = 20,
-                    },
-                    Child = new InputBlockingContainer
-                    {
-                        Masking = true,
-                        CornerRadius = 14,
+                        Anchor = Anchor.Centre,
+                        Origin = Anchor.Centre,
                         RelativeSizeAxes = Axes.Both,
-                        Children = new Drawable[]
+                        ColumnDimensions = new[]
                         {
-                            new Box
-                            {
-                                RelativeSizeAxes = Axes.Both,
-                                Colour = ColourProvider.Background6,
-                            },
-                            stackContainer = new Container
+                            new Dimension(),
+                            new Dimension(minSize: 640, maxSize: 800),
+                            new Dimension(),
+                        },
+                        Content = new[]
+                        {
+                            new[]
                             {
-                                Anchor = Anchor.Centre,
-                                Origin = Anchor.Centre,
-                                RelativeSizeAxes = Axes.Both,
-                                Padding = new MarginPadding
+                                Empty(),
+                                new InputBlockingContainer
                                 {
-                                    Vertical = 20,
-                                    Horizontal = 70,
+                                    Masking = true,
+                                    CornerRadius = 14,
+                                    RelativeSizeAxes = Axes.Both,
+                                    Children = new Drawable[]
+                                    {
+                                        new Box
+                                        {
+                                            RelativeSizeAxes = Axes.Both,
+                                            Colour = ColourProvider.Background6,
+                                        },
+                                        new Container
+                                        {
+                                            RelativeSizeAxes = Axes.Both,
+                                            Padding = new MarginPadding
+                                            {
+                                                Vertical = 20,
+                                                Horizontal = 20,
+                                            },
+                                            Child = screenContent = new Container { RelativeSizeAxes = Axes.Both, },
+                                        },
+                                    },
                                 },
-                            }
-                        },
-                    },
+                                Empty(),
+                            },
+                        }
+                    }
                 },
             });
 
@@ -268,7 +283,7 @@ private void showFirstStep()
         {
             Debug.Assert(currentStepIndex == null);
 
-            stackContainer.Child = stack = new ScreenStack
+            screenContent.Child = stack = new ScreenStack
             {
                 RelativeSizeAxes = Axes.Both,
             };