(b9690c3b8) Improved settings screen layout

Barotrauma/BarotraumaClient/Source/GameSettings.cs

@@ -14,7 +14,6 @@ namespace Barotrauma
     {
         private enum Tab
         {
-            General,
             Graphics,
             Audio,
             Controls,
@@ -73,16 +72,80 @@ namespace Barotrauma
 
         private void CreateSettingsFrame()
         {
-            settingsFrame = new GUIFrame(new RectTransform(new Point(500, 500), GUI.Canvas, Anchor.Center));
+            settingsFrame = new GUIFrame(new RectTransform(new Point(1024, 768), GUI.Canvas, Anchor.Center));
 
-            new GUITextBlock(new RectTransform(new Vector2(1.0f, 0.15f), settingsFrame.RectTransform),
+            var settingsFramePadding = new GUIFrame(new RectTransform(new Vector2(0.95f, 0.9f), settingsFrame.RectTransform, Anchor.TopCenter) { RelativeOffset = new Vector2(0.0f, 0.05f) }, style: null);
-                TextManager.Get("Settings"), textAlignment: Alignment.Center, font: GUI.LargeFont);
 
-            var paddedFrame = new GUIFrame(new RectTransform(new Vector2(0.9f, 0.8f), settingsFrame.RectTransform, Anchor.Center)
+            /// General tab --------------------------------------------------------------
-            { RelativeOffset = new Vector2(0.0f, 0.06f) }, style: null);
+
+            var leftPanel = new GUILayoutGroup(new RectTransform(new Vector2(0.25f, 1.0f), settingsFramePadding.RectTransform, Anchor.TopLeft));
+
+            new GUITextBlock(new RectTransform(new Vector2(1.0f, 0.05f), leftPanel.RectTransform),
+                TextManager.Get("Settings"), textAlignment: Alignment.TopLeft, font: GUI.LargeFont);
+
+            var generalLayoutGroup = new GUILayoutGroup(new RectTransform(new Vector2(1.0f, 1.0f), leftPanel.RectTransform, Anchor.TopLeft));
+
+            //new GUITextBlock(new RectTransform(new Vector2(1.0f, 0.05f), generalLayoutGroup.RectTransform), TextManager.Get("ContentPackages"));
+            var contentPackageList = new GUIListBox(new RectTransform(new Vector2(1.0f, 0.75f), generalLayoutGroup.RectTransform))
+            {
+                CanBeFocused = false
+            };
+
+
+            foreach (ContentPackage contentPackage in ContentPackage.List)
+            {
+                var tickBox = new GUITickBox(new RectTransform(new Vector2(1.0f, 0.067f), contentPackageList.Content.RectTransform, minSize: new Point(0, 15)), contentPackage.Name)
+                {
+                    UserData = contentPackage,
+                    OnSelected = SelectContentPackage,
+                    Selected = SelectedContentPackages.Contains(contentPackage)
+                };
+                if (!contentPackage.IsCompatible())
+                {
+                    tickBox.TextColor = Color.Red;
+                    tickBox.Enabled = false;
+                    tickBox.ToolTip = TextManager.Get(contentPackage.GameVersion <= new Version(0, 0, 0, 0) ? "IncompatibleContentPackageUnknownVersion" : "IncompatibleContentPackage")
+                                    .Replace("[packagename]", contentPackage.Name)
+                                    .Replace("[packageversion]", contentPackage.GameVersion.ToString())
+                                    .Replace("[gameversion]", GameMain.Version.ToString());
+                }
+                else if (contentPackage.CorePackage && !contentPackage.ContainsRequiredCorePackageFiles(out List<ContentType> missingContentTypes))
+                {
+                    tickBox.TextColor = Color.Red;
+                    tickBox.Enabled = false;
+                    tickBox.ToolTip = TextManager.Get("ContentPackageMissingCoreFiles")
+                                    .Replace("[packagename]", contentPackage.Name)
+                                    .Replace("[missingfiletypes]", string.Join(", ", missingContentTypes));
+                }
+            }
+
+            new GUITextBlock(new RectTransform(new Vector2(0.92f, 0.05f), generalLayoutGroup.RectTransform), TextManager.Get("Language"));
+            var languageDD = new GUIDropDown(new RectTransform(new Vector2(0.92f, 0.05f), generalLayoutGroup.RectTransform));
+            foreach (string language in TextManager.AvailableLanguages)
+            {
+                languageDD.AddItem(TextManager.Get("Language." + language), language);
+            }
+            languageDD.SelectItem(TextManager.Language);
+            languageDD.OnSelected = (guiComponent, obj) =>
+            {
+                string newLanguage = obj as string;
+                if (newLanguage == Language) return true;
+
+                UnsavedSettings = true;
+                Language = newLanguage;
+
+                new GUIMessageBox(TextManager.Get("RestartRequiredLabel"), TextManager.Get("RestartRequiredLanguage"));
+
+                return true;
+            };
+
+            var rightPanel = new GUILayoutGroup(new RectTransform(new Vector2(1.0f - leftPanel.RectTransform.RelativeSize.X, 0.95f),
+                settingsFramePadding.RectTransform, Anchor.TopRight));
+
+            var tabButtonHolder = new GUILayoutGroup(new RectTransform(new Vector2(1.0f, 0.05f), rightPanel.RectTransform, Anchor.TopCenter), isHorizontal: true);
+
+            var paddedFrame = new GUIFrame(new RectTransform(new Vector2(1.0f, 1.0f), rightPanel.RectTransform, Anchor.Center), style: null);
 
-            var tabButtonHolder = new GUILayoutGroup(new RectTransform(new Vector2(0.9f, 0.05f), settingsFrame.RectTransform, Anchor.TopCenter)
-            { RelativeOffset = new Vector2(0.0f, 0.11f) }, isHorizontal: true);
 
             tabs = new GUIFrame[Enum.GetValues(typeof(Tab)).Length];
             tabButtons = new GUIButton[tabs.Length];
@@ -106,10 +169,10 @@ namespace Barotrauma
 
             var leftColumn = new GUILayoutGroup(new RectTransform(new Vector2(0.46f, 0.95f), tabs[(int)Tab.Graphics].RectTransform, Anchor.CenterLeft)
             { RelativeOffset = new Vector2(0.02f, 0.0f) })
-            { RelativeSpacing = 0.01f, Stretch = true };
+            { RelativeSpacing = 0.01f };
             var rightColumn = new GUILayoutGroup(new RectTransform(new Vector2(0.46f, 0.95f), tabs[(int)Tab.Graphics].RectTransform, Anchor.CenterRight)
             { RelativeOffset = new Vector2(0.02f, 0.0f) })
-            { RelativeSpacing = 0.01f, Stretch = true };
+            { RelativeSpacing = 0.01f };
 
             var supportedDisplayModes = new List<DisplayMode>();
             foreach (DisplayMode mode in GraphicsAdapter.DefaultAdapter.SupportedDisplayModes)
@@ -176,9 +239,6 @@ namespace Barotrauma
                 return true;
             };
 
-            //spacing
-            new GUIFrame(new RectTransform(new Vector2(1.0f, 0.02f), leftColumn.RectTransform), style: null);
-
             GUITickBox vsyncTickBox = new GUITickBox(new RectTransform(new Vector2(1.0f, 0.05f), leftColumn.RectTransform), TextManager.Get("EnableVSync"))
             {
                 ToolTip = TextManager.Get("EnableVSyncToolTip"),
@@ -194,8 +254,6 @@ namespace Barotrauma
                 Selected = VSyncEnabled
             };
 
-            //spacing
-            new GUIFrame(new RectTransform(new Vector2(1.0f, 0.5f), leftColumn.RectTransform), style: null);
             GUITextBlock particleLimitText = new GUITextBlock(new RectTransform(new Vector2(1.0f, 0.05f), rightColumn.RectTransform), TextManager.Get("ParticleLimit"));
             GUIScrollBar particleScrollBar = new GUIScrollBar(new RectTransform(new Vector2(1.0f, 0.05f), rightColumn.RectTransform),
                 barSize: 0.1f)
@@ -212,8 +270,6 @@ namespace Barotrauma
             };
             particleScrollBar.OnMoved(particleScrollBar, particleScrollBar.BarScroll);
 
-            //spacing
-            new GUIFrame(new RectTransform(new Vector2(1.0f, 0.02f), rightColumn.RectTransform), style: null);
             new GUITextBlock(new RectTransform(new Vector2(1.0f, 0.05f), rightColumn.RectTransform), TextManager.Get("LosEffect"));
             var losModeDD = new GUIDropDown(new RectTransform(new Vector2(1.0f, 0.05f), rightColumn.RectTransform));
             losModeDD.AddItem(TextManager.Get("LosModeNone"), LosMode.None);
@@ -232,8 +288,6 @@ namespace Barotrauma
                 return true;
             };
 
-            //spacing
-            new GUIFrame(new RectTransform(new Vector2(1.0f, 0.05f), rightColumn.RectTransform), style: null);
             GUITextBlock LightText = new GUITextBlock(new RectTransform(new Vector2(1.0f, 0.05f), rightColumn.RectTransform), TextManager.Get("LightMapScale"))
             {
                 ToolTip = TextManager.Get("LightMapScaleToolTip")
@@ -254,8 +308,6 @@ namespace Barotrauma
             };
             lightScrollBar.OnMoved(lightScrollBar, lightScrollBar.BarScroll);
 
-            //spacing
-            new GUIFrame(new RectTransform(new Vector2(1.0f, 0.05f), rightColumn.RectTransform), style: null);
             new GUITickBox(new RectTransform(new Vector2(1.0f, 0.05f), rightColumn.RectTransform), TextManager.Get("SpecularLighting"))
             {
                 ToolTip = TextManager.Get("SpecularLightingToolTip"),
@@ -268,8 +320,6 @@ namespace Barotrauma
                 }
             };
 
-            //spacing
-            new GUIFrame(new RectTransform(new Vector2(1.0f, 0.02f), rightColumn.RectTransform), style: null);
             new GUITickBox(new RectTransform(new Vector2(1.0f, 0.05f), rightColumn.RectTransform), TextManager.Get("ChromaticAberration"))
             {
                 ToolTip = TextManager.Get("ChromaticAberrationToolTip"),
@@ -282,9 +332,6 @@ namespace Barotrauma
                 }
             };
 
-            //spacing
-            new GUIFrame(new RectTransform(new Vector2(1.0f, 0.05f), rightColumn.RectTransform), style: null);
-
             GUITextBlock HUDScaleText = new GUITextBlock(new RectTransform(new Vector2(1.0f, 0.05f), rightColumn.RectTransform), TextManager.Get("HUDScale"));
             GUIScrollBar HUDScaleScrollBar = new GUIScrollBar(new RectTransform(new Vector2(1.0f, 0.05f), rightColumn.RectTransform),
                 barSize: 0.1f)
@@ -303,9 +350,6 @@ namespace Barotrauma
             };
             HUDScaleScrollBar.OnMoved(HUDScaleScrollBar, HUDScaleScrollBar.BarScroll);
 
-            //spacing
-            new GUIFrame(new RectTransform(new Vector2(1.0f, 0.02f), rightColumn.RectTransform), style: null);
-
             GUITextBlock inventoryScaleText = new GUITextBlock(new RectTransform(new Vector2(1.0f, 0.05f), rightColumn.RectTransform), TextManager.Get("InventoryScale"));
             GUIScrollBar inventoryScaleScrollBar = new GUIScrollBar(new RectTransform(new Vector2(1.0f, 0.05f), rightColumn.RectTransform), barSize: 0.1f)
             {
@@ -322,9 +366,6 @@ namespace Barotrauma
             };
             inventoryScaleScrollBar.OnMoved(inventoryScaleScrollBar, inventoryScaleScrollBar.BarScroll);
 
-            //spacing
-            new GUIFrame(new RectTransform(new Vector2(1.0f, 0.2f), rightColumn.RectTransform), style: null);
-
             /// Audio tab ----------------------------------------------------------------
 
             var audioSliders = new GUILayoutGroup(new RectTransform(new Vector2(0.95f, 0.4f), tabs[(int)Tab.Audio].RectTransform, Anchor.TopCenter)
@@ -570,9 +611,9 @@ namespace Barotrauma
             var inputNames = Enum.GetValues(typeof(InputType));
             for (int i = 0; i < inputNames.Length; i++)
             {
-                var inputContainer = new GUIFrame(new RectTransform(new Vector2(1.0f, 0.06f), inputFrame.RectTransform), style: null);
+                var inputContainer = new GUILayoutGroup(new RectTransform(new Vector2(1.0f, 0.06f), inputFrame.RectTransform)) { Stretch = true, IsHorizontal = true, RelativeSpacing = 0.05f };
-                new GUITextBlock(new RectTransform(new Vector2(0.6f, 1.0f), inputContainer.RectTransform), TextManager.Get("InputType." + ((InputType)i)) + ": ", font: GUI.SmallFont);
+                new GUITextBlock(new RectTransform(new Vector2(0.25f, 1.0f), inputContainer.RectTransform, Anchor.TopLeft), TextManager.Get("InputType." + ((InputType)i)) + ": ", font: GUI.SmallFont) { ForceUpperCase = true };
-                var keyBox = new GUITextBox(new RectTransform(new Vector2(0.4f, 1.0f), inputContainer.RectTransform, Anchor.TopRight),
+                var keyBox = new GUITextBox(new RectTransform(new Vector2(1.0f, 1.0f), inputContainer.RectTransform),
                     text: keyMapping[i].ToString(), font: GUI.SmallFont)
                 {
                     UserData = i
@@ -596,68 +637,6 @@ namespace Barotrauma
             };
             aimAssistSlider.OnMoved(aimAssistSlider, aimAssistSlider.BarScroll);
 
-            /// General tab --------------------------------------------------------------
-
-            var generalLayoutGroup = new GUILayoutGroup(new RectTransform(new Vector2(0.95f, 0.95f), tabs[(int)Tab.General].RectTransform, Anchor.Center)
-                { RelativeOffset = new Vector2(0.0f, 0.0f) }) { RelativeSpacing = 0.01f, Stretch = true };
-
-            new GUITextBlock(new RectTransform(new Vector2(1.0f, 0.05f), generalLayoutGroup.RectTransform), TextManager.Get("ContentPackages"));
-            var contentPackageList = new GUIListBox(new RectTransform(new Vector2(1.0f, 0.4f), generalLayoutGroup.RectTransform))
-            {
-                CanBeFocused = false
-            };
-
-
-            foreach (ContentPackage contentPackage in ContentPackage.List)
-            {
-                var tickBox = new GUITickBox(new RectTransform(new Vector2(1.0f, 0.1f), contentPackageList.Content.RectTransform, minSize: new Point(0, 15)), contentPackage.Name)
-                {
-                    UserData = contentPackage,
-                    OnSelected = SelectContentPackage,
-                    Selected = SelectedContentPackages.Contains(contentPackage)
-                };
-                if (!contentPackage.IsCompatible())
-                {
-                    tickBox.TextColor = Color.Red;
-                    tickBox.Enabled = false;
-                    tickBox.ToolTip = TextManager.Get(contentPackage.GameVersion <= new Version(0, 0, 0, 0) ? "IncompatibleContentPackageUnknownVersion" : "IncompatibleContentPackage")
-                                    .Replace("[packagename]", contentPackage.Name)
-                                    .Replace("[packageversion]", contentPackage.GameVersion.ToString())
-                                    .Replace("[gameversion]", GameMain.Version.ToString());
-                }
-                else if (contentPackage.CorePackage && !contentPackage.ContainsRequiredCorePackageFiles(out List<ContentType> missingContentTypes))
-                {
-                    tickBox.TextColor = Color.Red;
-                    tickBox.Enabled = false;
-                    tickBox.ToolTip = TextManager.Get("ContentPackageMissingCoreFiles")
-                                    .Replace("[packagename]", contentPackage.Name)
-                                    .Replace("[missingfiletypes]", string.Join(", ", missingContentTypes));
-                }
-            }
-
-            //spacing
-            new GUIFrame(new RectTransform(new Vector2(1.0f, 0.02f), generalLayoutGroup.RectTransform), style: null);
-
-            new GUITextBlock(new RectTransform(new Vector2(1.0f, 0.05f), generalLayoutGroup.RectTransform), TextManager.Get("Language"));
-            var languageDD = new GUIDropDown(new RectTransform(new Vector2(1.0f, 0.05f), generalLayoutGroup.RectTransform));
-            foreach (string language in TextManager.AvailableLanguages)
-            {
-                languageDD.AddItem(TextManager.Get("Language." + language), language);
-            }
-            languageDD.SelectItem(TextManager.Language);
-            languageDD.OnSelected = (guiComponent, obj) =>
-            {
-                string newLanguage = obj as string;
-                if (newLanguage == Language) return true;
-
-                UnsavedSettings = true;
-                Language = newLanguage;
-
-                new GUIMessageBox(TextManager.Get("RestartRequiredLabel"), TextManager.Get("RestartRequiredLanguage"));
-
-                return true;
-            };
-
             //spacing
             new GUIFrame(new RectTransform(new Vector2(1.0f, 0.02f), generalLayoutGroup.RectTransform), style: null);
 
@@ -686,7 +665,7 @@ namespace Barotrauma
             applyButton.OnClicked = ApplyClicked;
 
             UnsavedSettings = false; // Reset unsaved settings to false once the UI has been created
-            SelectTab(Tab.General);
+            SelectTab(Tab.Graphics);
         }
 
         private void SelectTab(Tab tab)