From 1a438e644f17f1352cec29d90fa755f37e120f34 Mon Sep 17 00:00:00 2001
From: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
Date: Sat, 17 Feb 2024 05:55:42 +1100
Subject: [PATCH] Re-organise main menu screen (#25173)

- The dummy control of 2px size has annoyed me for almost 5 years.
- Why is it in the top-right.
- Why is the server address not labelled.
---
 .../MainMenu/UI/MainMenuControl.xaml          | 72 ++++++++++---------
 .../Locale/en-US/main-menu/main-menu.ftl      |  5 +-
 2 files changed, 40 insertions(+), 37 deletions(-)

diff --git a/Content.Client/MainMenu/UI/MainMenuControl.xaml b/Content.Client/MainMenu/UI/MainMenuControl.xaml
index 16a8cc267a..d6c3f4b941 100644
--- a/Content.Client/MainMenu/UI/MainMenuControl.xaml
+++ b/Content.Client/MainMenu/UI/MainMenuControl.xaml
@@ -2,44 +2,46 @@
          xmlns:pllax="clr-namespace:Content.Client.Parallax"
          xmlns:clog="clr-namespace:Content.Client.Changelog">
     <pllax:ParallaxControl />
-    <LayoutContainer>
-        <BoxContainer Name="VBox"
-                      Orientation="Vertical"
-                      StyleIdentifier="mainMenuVBox">
-            <TextureRect Name="Logo"
-                         Stretch="KeepCentered" />
-            <BoxContainer Orientation="Horizontal"
-                          SeparationOverride="4">
-                <Label Text="{Loc 'main-menu-username-label'}" />
-                <LineEdit Name="UsernameBox"
-                          Access="Public"
-                          PlaceHolder="{Loc 'main-menu-username-text'}"
-                          HorizontalExpand="True" />
-            </BoxContainer>
+    <BoxContainer Name="VBox"
+                  Orientation="Vertical"
+                  HorizontalAlignment="Center"
+                  VerticalAlignment="Center"
+                  HorizontalExpand="True"
+                  VerticalExpand="True"
+                  StyleIdentifier="mainMenuVBox"
+                  SeparationOverride="3">
+        <TextureRect Name="Logo"
+                     Stretch="KeepCentered"/>
+        <GridContainer Columns="2">
+            <Label Text="{Loc 'main-menu-username-label'}" />
+            <LineEdit Name="UsernameBox"
+                      Access="Public"
+                      PlaceHolder="{Loc 'main-menu-username-text'}"
+                      HorizontalExpand="True" />
+            <Label Text="{Loc 'main-menu-address-label'}"/>
             <LineEdit Name="AddressBox"
                       Access="Public"
                       Text="localhost"
                       PlaceHolder="server address:port"
                       HorizontalExpand="True" />
-            <Button Name="DirectConnectButton"
-                    Access="Public"
-                    Text="{Loc 'main-menu-direct-connect-button'}"
-                    TextAlign="Center"
-                    StyleIdentifier="mainMenu" />
-            <Control MinSize="0 2" />
-            <Button Name="OptionsButton"
-                    Access="Public"
-                    Text="{Loc 'main-menu-options-button'}"
-                    TextAlign="Center"
-                    StyleIdentifier="mainMenu" />
-            <Button Name="QuitButton"
-                    Access="Public"
-                    Text="{Loc 'main-menu-quit-button'}"
-                    TextAlign="Center"
-                    StyleIdentifier="mainMenu" />
-            <clog:ChangelogButton
-                Name="ChangelogButton"
-                Access="Public"/>
-        </BoxContainer>
-    </LayoutContainer>
+        </GridContainer>
+        <Button Name="DirectConnectButton"
+                Access="Public"
+                Text="{Loc 'main-menu-direct-connect-button'}"
+                TextAlign="Center"
+                StyleIdentifier="mainMenu"/>
+        <Button Name="OptionsButton"
+                Access="Public"
+                Text="{Loc 'main-menu-options-button'}"
+                TextAlign="Center"
+                StyleIdentifier="mainMenu"/>
+        <Button Name="QuitButton"
+                Access="Public"
+                Text="{Loc 'main-menu-quit-button'}"
+                TextAlign="Center"
+                StyleIdentifier="mainMenu"/>
+        <clog:ChangelogButton
+            Name="ChangelogButton"
+            Access="Public"/>
+    </BoxContainer>
 </Control>
diff --git a/Resources/Locale/en-US/main-menu/main-menu.ftl b/Resources/Locale/en-US/main-menu/main-menu.ftl
index 6e7bfa3e92..ca81befaaf 100644
--- a/Resources/Locale/en-US/main-menu/main-menu.ftl
+++ b/Resources/Locale/en-US/main-menu/main-menu.ftl
@@ -2,11 +2,12 @@ main-menu-invalid-username-with-reason = Invalid username:
                                          {$invalidReason}
 main-menu-invalid-username = Invalid username
 main-menu-failed-to-connect = Failed to connect:
-                              {$reason} 
+                              {$reason}
 main-menu-username-label = Username:
 main-menu-username-text = Username
+main-menu-address-label = Server Address:
 main-menu-join-public-server-button = Join Public Server
 main-menu-join-public-server-button-tooltip = Cannot connect to public server with a debug build.
 main-menu-direct-connect-button = Direct Connect
 main-menu-options-button = Options
-main-menu-quit-button = Quit
\ No newline at end of file
+main-menu-quit-button = Quit