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

This commit is contained in:
Regalis
2017-04-18 20:08:56 +03:00
parent a2e21a78f9
commit acaa8697c8
2 changed files with 28 additions and 18 deletions

View File

@@ -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>();