Settings and dev settings: Preserve the current tab. Minor UI tweaks.

UI/TabbedDialogScreen.cpp

@@ -101,6 +101,10 @@ void UITabbedBaseDialogScreen::CreateViews() {
 
 	// Let the subclass create its tabs.
 	CreateTabs();
+	if (currentTabSetting_) {
+		tabHolder_->SetInitialTab(*currentTabSetting_);
+	}
+	tabHolder_->EnsureTab(tabHolder_->GetCurrentTab());
 
 	if (System_GetPropertyBool(SYSPROP_HAS_KEYBOARD) || System_GetPropertyBool(SYSPROP_HAS_TEXT_INPUT_DIALOG)) {
 		// Hide search if screen is too small.
@@ -133,6 +137,12 @@ void UITabbedBaseDialogScreen::CreateViews() {
 	}
 }
 
+UITabbedBaseDialogScreen::~UITabbedBaseDialogScreen() {
+	if (currentTabSetting_) {
+		*currentTabSetting_ = GetCurrentTab();
+	}
+}
+
 void UITabbedBaseDialogScreen::sendMessage(UIMessage message, const char *value) {
 	UIBaseDialogScreen::sendMessage(message, value);
 	if (message == UIMessage::GAMESETTINGS_SEARCH) {