From 6fad5463d034402653f009b6498c939b7df5b0f9 Mon Sep 17 00:00:00 2001
From: "Unknown W. Brackets" <checkins@unknownbrackets.org>
Date: Sun, 14 Aug 2022 11:42:04 -0700
Subject: [PATCH] GE Debugger: Save tab configuration.

---
 Core/Config.cpp                   |  3 +++
 Core/Config.h                     |  3 +++
 Windows/GEDebugger/GEDebugger.cpp | 42 +++++++++++++++++++++++++------
 3 files changed, 41 insertions(+), 7 deletions(-)

diff --git a/Core/Config.cpp b/Core/Config.cpp
index 91264ca5b4..4c5d312bf2 100644
--- a/Core/Config.cpp
+++ b/Core/Config.cpp
@@ -1167,6 +1167,9 @@ static ConfigSetting debuggerSettings[] = {
 	ConfigSetting("GEWindowY", &g_Config.iGEWindowY, -1),
 	ConfigSetting("GEWindowW", &g_Config.iGEWindowW, -1),
 	ConfigSetting("GEWindowH", &g_Config.iGEWindowH, -1),
+	ConfigSetting("GEWindowTabsBL", &g_Config.uGETabsLeft, (uint32_t)0),
+	ConfigSetting("GEWindowTabsBR", &g_Config.uGETabsRight, (uint32_t)0),
+	ConfigSetting("GEWindowTabsTR", &g_Config.uGETabsTopRight, (uint32_t)0),
 	ConfigSetting("ConsoleWindowX", &g_Config.iConsoleWindowX, -1),
 	ConfigSetting("ConsoleWindowY", &g_Config.iConsoleWindowY, -1),
 	ConfigSetting("FontWidth", &g_Config.iFontWidth, 8),
diff --git a/Core/Config.h b/Core/Config.h
index e682234ba3..7a35ff0d09 100644
--- a/Core/Config.h
+++ b/Core/Config.h
@@ -462,6 +462,9 @@ public:
 	int iGEWindowY;
 	int iGEWindowW;
 	int iGEWindowH;
+	uint32_t uGETabsLeft;
+	uint32_t uGETabsRight;
+	uint32_t uGETabsTopRight;
 	int iConsoleWindowX;
 	int iConsoleWindowY;
 	int iFontWidth;
diff --git a/Windows/GEDebugger/GEDebugger.cpp b/Windows/GEDebugger/GEDebugger.cpp
index b28ee32ccb..1546019124 100644
--- a/Windows/GEDebugger/GEDebugger.cpp
+++ b/Windows/GEDebugger/GEDebugger.cpp
@@ -212,6 +212,27 @@ CGEDebugger::CGEDebugger(HINSTANCE _hInstance, HWND _hParent)
 	fbTabs->ShowTab(0, true);
 
 	tabStates_ = defaultTabs;
+	// Restore settings, if any set.
+	_assert_msg_(defaultTabs.size() <= 32, "Cannot have more than 32 tabs");
+	if ((g_Config.uGETabsLeft | g_Config.uGETabsRight | g_Config.uGETabsTopRight) != 0) {
+		for (int i = 0; i < (int)tabStates_.size(); ++i) {
+			int mask = 1 << i;
+			tabStates_[i].pos = (GETabPosition)0;
+			if (g_Config.uGETabsLeft & mask)
+				tabStates_[i].pos |= GETabPosition::LEFT;
+			if (g_Config.uGETabsRight & mask)
+				tabStates_[i].pos |= GETabPosition::RIGHT;
+			if (g_Config.uGETabsTopRight & mask)
+				tabStates_[i].pos |= GETabPosition::TOPRIGHT;
+			// If this is a new tab, add it to left.
+			if (tabStates_[i].pos == (GETabPosition)0) {
+				tabStates_[i].pos |= GETabPosition::LEFT;
+				g_Config.uGETabsLeft |= 1 << i;
+			}
+		}
+	} else {
+		g_Config.uGETabsLeft = (1 << tabStates_.size()) - 1;
+	}
 	for (GEDebuggerTab &tabState : tabStates_) {
 		AddTab(&tabState, tabState.pos);
 	}
@@ -1123,10 +1144,13 @@ void CGEDebugger::CheckTabMessage(TabControl *t, GETabPosition pos, LPARAM lPara
 
 	// Find the tabState that was clicked on.
 	GEDebuggerTab *tab = nullptr;
-	for (GEDebuggerTab &tabState : tabStates_) {
+	int tabStateIndex = 0;
+	for (int i = 0; i < (int)tabStates_.size(); ++i) {
+		GEDebuggerTab &tabState = tabStates_[i];
 		int foundIndex = HasTabIndex(&tabState, pos);
 		if (foundIndex == tabIndex) {
 			tab = &tabState;
+			tabStateIndex = i;
 			break;
 		}
 	}
@@ -1149,12 +1173,16 @@ void CGEDebugger::CheckTabMessage(TabControl *t, GETabPosition pos, LPARAM lPara
 		EnableMenuItem(subMenu, itemIDs[i], disabled ? MF_GRAYED : MF_ENABLED);
 	}
 
-	auto toggleState = [&](GEPanelIndex i, GETabPosition pos) {
+	auto toggleState = [&](GEPanelIndex i, GETabPosition pos, uint32_t &configured) {
 		auto &state = tab->state[(int)i];
-		if (state.index != -1 && state.ptr)
+		bool removing = state.index != -1 && state.ptr;
+		if (removing) {
 			RemoveTab(tab, pos);
-		else
+			configured &= ~(1 << tabStateIndex);
+		} else {
 			AddTab(tab, pos);
+			configured |= 1 << tabStateIndex;
+		}
 
 		RECT rc;
 		GetClientRect(m_hDlg, &rc);
@@ -1163,15 +1191,15 @@ void CGEDebugger::CheckTabMessage(TabControl *t, GETabPosition pos, LPARAM lPara
 
 	switch (TriggerContextMenu(ContextMenuID::GEDBG_TABS, m_hDlg, ContextPoint::FromCursor())) {
 	case ID_GEDBG_SHOWONLEFT:
-		toggleState(GEPanelIndex::LEFT, GETabPosition::LEFT);
+		toggleState(GEPanelIndex::LEFT, GETabPosition::LEFT, g_Config.uGETabsLeft);
 		break;
 
 	case ID_GEDBG_SHOWONRIGHT:
-		toggleState(GEPanelIndex::RIGHT, GETabPosition::RIGHT);
+		toggleState(GEPanelIndex::RIGHT, GETabPosition::RIGHT, g_Config.uGETabsRight);
 		break;
 
 	case ID_GEDBG_SHOWONTOPRIGHT:
-		toggleState(GEPanelIndex::TOPRIGHT, GETabPosition::TOPRIGHT);
+		toggleState(GEPanelIndex::TOPRIGHT, GETabPosition::TOPRIGHT, g_Config.uGETabsTopRight);
 		break;
 
 	default: