From acaa8697c865a0617da345339b55e672bb084e15 Mon Sep 17 00:00:00 2001
From: Regalis <regalis@undertowgames.com>
Date: Tue, 18 Apr 2017 20:08:56 +0300
Subject: [PATCH] Small menu fixes: open menus are closed when opening another
 one in the sub editor (e.g. if the save dialog box is opened when one of the
 entity menus are open), switching to the correct tab from the settings menu
 when going through the "apply changes" dialog

---
 Subsurface/Source/Screens/EditMapScreen.cs  | 18 ++++++++++---
 Subsurface/Source/Screens/MainMenuScreen.cs | 28 ++++++++++-----------
 2 files changed, 28 insertions(+), 18 deletions(-)

diff --git a/Subsurface/Source/Screens/EditMapScreen.cs b/Subsurface/Source/Screens/EditMapScreen.cs
index 7a891a3cc..ce6447f2a 100644
--- a/Subsurface/Source/Screens/EditMapScreen.cs
+++ b/Subsurface/Source/Screens/EditMapScreen.cs
@@ -140,11 +140,20 @@ namespace Barotrauma
             selectedHullVolume.TextGetter = GetSelectedHullVolume;
 
             var button = new GUIButton(new Rectangle(0, 0, 70, 20), "Open...", GUI.Style, topPanel);
-            button.OnClicked = CreateLoadScreen;
+            button.OnClicked = (GUIButton btn, object data) =>
+            {
+                saveFrame = null;
+                selectedTab = -1;
+                CreateLoadScreen();
+
+                return true;
+            };
 
             button = new GUIButton(new Rectangle(80,0,70,20), "Save", GUI.Style, topPanel);
             button.OnClicked = (GUIButton btn, object data) =>
             {
+                loadFrame = null;
+                selectedTab = -1;
                 CreateSaveScreen();
 
                 return true;
@@ -503,7 +512,7 @@ namespace Barotrauma
 
         }
 
-        private bool CreateLoadScreen(GUIButton button, object obj)
+        private bool CreateLoadScreen()
         {
             if (characterMode) ToggleCharacterMode();
             if (wiringMode) ToggleWiringMode();
@@ -562,7 +571,7 @@ namespace Barotrauma
 
                 deleteButton.Enabled = false;
 
-                CreateLoadScreen(null, null);
+                CreateLoadScreen();
 
                 return true;
             };
@@ -605,6 +614,9 @@ namespace Barotrauma
             if (characterMode) ToggleCharacterMode();
             if (wiringMode) ToggleWiringMode();
 
+            saveFrame = null;
+            loadFrame = null;
+
             selectedTab = (int)obj;
 
             var searchBox = GUItabs[selectedTab].GetChild<GUITextBox>();  
diff --git a/Subsurface/Source/Screens/MainMenuScreen.cs b/Subsurface/Source/Screens/MainMenuScreen.cs
index f172d3daa..53d109c34 100644
--- a/Subsurface/Source/Screens/MainMenuScreen.cs
+++ b/Subsurface/Source/Screens/MainMenuScreen.cs
@@ -26,7 +26,7 @@ namespace Barotrauma
 
         private GameMain game;
 
-        int selectedTab;
+        private Tab selectedTab;
 
         public MainMenuScreen(GameMain game)
         {
@@ -198,7 +198,6 @@ namespace Barotrauma
             UpdateSubList();
 
             SelectTab(null, 0);
-            //selectedTab = 0;
         }
 
         private void UpdateSubList()
@@ -273,42 +272,41 @@ namespace Barotrauma
                 return;
             }
 
-            selectedTab = (int)tab;
+            selectedTab = tab;
 
             switch (selectedTab)
             {
-                case (int)Tab.NewGame:
+                case Tab.NewGame:
                     saveNameBox.Text = SaveUtil.CreateSavePath();
                     break;
-                case (int)Tab.LoadGame:
+                case Tab.LoadGame:
                     UpdateLoadScreen();
                     break;
-                case (int)Tab.Settings:
+                case Tab.Settings:
                     GameMain.Config.ResetSettingsFrame();
                     menuTabs[(int)Tab.Settings] = GameMain.Config.SettingsFrame;
                     break;
             }
         }
 
-        private bool ApplySettings(GUIButton button, object obj)
+        private bool ApplySettings(GUIButton button, object userData)
         {
             GameMain.Config.Save("config.xml");
-            selectedTab = 0;
+            
+            if (userData is Tab) SelectTab((Tab)userData);            
 
             if (GameMain.GraphicsWidth != GameMain.Config.GraphicsWidth || GameMain.GraphicsHeight != GameMain.Config.GraphicsHeight)
             {
                 new GUIMessageBox("Restart required", "You need to restart the game for the resolution changes to take effect.");
             }
 
-
-
             return true;
         }
 
-        private bool DiscardSettings(GUIButton button, object obj)
+        private bool DiscardSettings(GUIButton button, object userData)
         {
             GameMain.Config.Load("config.xml");
-            selectedTab = (int)obj;
+            if (userData is Tab) SelectTab((Tab)userData);
 
             return true;
         }
@@ -479,13 +477,13 @@ namespace Barotrauma
         public override void AddToGUIUpdateList()
         {
             buttonsTab.AddToGUIUpdateList();
-            if (selectedTab > 0) menuTabs[selectedTab].AddToGUIUpdateList();
+            if (selectedTab > 0) menuTabs[(int)selectedTab].AddToGUIUpdateList();
         }
 
         public override void Update(double deltaTime)
         {
             buttonsTab.Update((float)deltaTime);
-            if (selectedTab>0) menuTabs[selectedTab].Update((float)deltaTime);
+            if (selectedTab>0) menuTabs[(int)selectedTab].Update((float)deltaTime);
 
             GameMain.TitleScreen.TitlePosition =
                 Vector2.Lerp(GameMain.TitleScreen.TitlePosition, new Vector2(
@@ -507,7 +505,7 @@ namespace Barotrauma
             spriteBatch.Begin(0, BlendState.AlphaBlend);
 
             buttonsTab.Draw(spriteBatch);
-            if (selectedTab>0) menuTabs[selectedTab].Draw(spriteBatch);
+            if (selectedTab>0) menuTabs[(int)selectedTab].Draw(spriteBatch);
 
             GUI.Draw((float)deltaTime, spriteBatch, null);