Merge branch 'optionsmenuworking!' into main

Author: githubawn

Core/GameEngineDevice/Source/Win32Device/GameClient/Win32Mouse.cpp

@@ -435,23 +435,30 @@ void Win32Mouse::capture()
 {
 
 	RECT rect;
-	::GetClientRect(ApplicationHWnd, &rect);
+	if (TheGlobalData && TheGlobalData->m_windowed)
+	{
+		::GetWindowRect(ApplicationHWnd, &rect);
+	}
+	else
+	{
+		::GetClientRect(ApplicationHWnd, &rect);
 
-	POINT leftTop;
-	leftTop.x = rect.left;
-	leftTop.y = rect.top;
+		POINT leftTop;
+		leftTop.x = rect.left;
+		leftTop.y = rect.top;
 
-	POINT rightBottom;
-	rightBottom.x = rect.right;
-	rightBottom.y = rect.bottom;
+		POINT rightBottom;
+		rightBottom.x = rect.right;
+		rightBottom.y = rect.bottom;
 
-	::ClientToScreen(ApplicationHWnd, &leftTop);
-	::ClientToScreen(ApplicationHWnd, &rightBottom);
+		::ClientToScreen(ApplicationHWnd, &leftTop);
+		::ClientToScreen(ApplicationHWnd, &rightBottom);
 
-	rect.left = leftTop.x;
-	rect.top = leftTop.y;
-	rect.right = rightBottom.x;
-	rect.bottom = rightBottom.y;
+		rect.left = leftTop.x;
+		rect.top = leftTop.y;
+		rect.right = rightBottom.x;
+		rect.bottom = rightBottom.y;
+	}
 
 	if (::ClipCursor(&rect))
 	{

Generals/Code/GameEngine/Include/GameClient/Shell.h

@@ -196,6 +196,7 @@ class Shell : public SubsystemInterface
 	WindowLayout *m_saveLoadMenuLayout;											///< save/load menu layout
 	WindowLayout *m_popupReplayLayout;											///< replay save menu layout
 	WindowLayout *m_optionsLayout;													///< options menu layout
+	Bool m_isRecreatingLayouts;
 
 };
 

Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/ControlBarPopupDescription.cpp

@@ -99,6 +99,7 @@ static GameWindow *theWindow = nullptr;
 static AnimateWindowManager *theAnimateWindowManager = nullptr;
 static GameWindow *prevWindow = nullptr;
 static Bool useAnimation = FALSE;
+static ICoord2D g_lastTooltipOffset = { 0, 0 };
 void ControlBarPopupDescriptionUpdateFunc( WindowLayout *layout, void *param )
 {
 	if(TheScriptEngine->isGameEnding())
@@ -558,7 +559,6 @@ void ControlBar::populateBuildTooltipLayout( const CommandButton *commandButton,
 	{
 
 		static NameKeyType winNamekey	= TheNameKeyGenerator->nameToKey( "ControlBar.wnd:BackgroundMarker" );
-		static ICoord2D lastOffset = { 0, 0 };
 
 		ICoord2D size, newSize, pos;
 		Int diffSize;
@@ -593,7 +593,7 @@ void ControlBar::populateBuildTooltipLayout( const CommandButton *commandButton,
 //		heightChange = controlBarPos.y - m_defaultControlBarPosition.y;
 
 		GameWindow *marker =  TheWindowManager->winGetWindowFromId(nullptr,winNamekey);
-		static ICoord2D basePos;
+		ICoord2D basePos;
 		if(!marker)
 		{
 			return;
@@ -605,10 +605,10 @@ void ControlBar::populateBuildTooltipLayout( const CommandButton *commandButton,
 		offset.x = curPos.x - basePos.x;
 		offset.y = curPos.y - basePos.y;
 
-		parent->winSetPosition(pos.x, (pos.y - diffSize) + (offset.y - lastOffset.y));
+		parent->winSetPosition(pos.x, (pos.y - diffSize) + (offset.y - g_lastTooltipOffset.y));
 
-		lastOffset.x = offset.x;
-		lastOffset.y = offset.y;
+		g_lastTooltipOffset.x = offset.x;
+		g_lastTooltipOffset.y = offset.y;
 
 		win->winGetSize(&size.x, &size.y);
  		win->winSetSize(size.x, size.y + diffSize);
@@ -633,6 +633,8 @@ void ControlBar::hideBuildTooltipLayout()
 
 void ControlBar::deleteBuildTooltipLayout()
 {
+	g_lastTooltipOffset.x = 0;
+	g_lastTooltipOffset.y = 0;
 	m_showBuildToolTipLayout = FALSE;
 	prevWindow= nullptr;
 	m_buildToolTipLayout->hide(TRUE);

Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/OptionsMenu.cpp

@@ -1369,9 +1369,6 @@ void OptionsMenuInit( WindowLayout *layout, void *userData )
 		if (comboBoxDetail)
 			comboBoxDetail->winEnable(FALSE);
 
-		if (comboBoxResolution)
-			comboBoxResolution->winEnable(FALSE);
-
 		if (textEntryFirewallPortOverride)
 			textEntryFirewallPortOverride->winEnable(FALSE);
 

Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/QuitMenu.cpp

@@ -65,8 +65,8 @@ static Bool isVisible = FALSE;
 
 static GameWindow *quitConfirmationWindow = nullptr;
 
-//external declarations of the Gadgets the callbacks can use
-static WindowLayout *saveLoadMenuLayout = nullptr;
+// Antigravity @bugfix 20/05/2026 Make saveLoadMenuLayout non-static for resolution recreation
+WindowLayout *saveLoadMenuLayout = nullptr;
 
 static GameWindow *buttonRestartWin	= nullptr;
 static GameWindow *buttonSaveLoadWin = nullptr;

Generals/Code/GameEngine/Source/GameClient/GUI/Shell/Shell.cpp

@@ -32,6 +32,8 @@
 
 #include "Common/RandomValue.h"
 #include "GameClient/Shell.h"
+#include "GameClient/InGameUI.h"
+#include "GameClient/GUICallbacks.h"
 #include "GameClient/WindowLayout.h"
 #include "GameClient/GameWindowManager.h"
 #include "GameClient/GameWindowTransitions.h"
@@ -85,6 +87,7 @@ void Shell::construct()
 	m_popupReplayLayout = nullptr;
 	m_optionsLayout = nullptr;
 	m_screenCount = 0;
+	m_isRecreatingLayouts = FALSE;
 }
 
 //-------------------------------------------------------------------------------------------------
@@ -113,28 +116,30 @@ void Shell::deconstruct()
 	// delete the save/load menu if present
 	if( m_saveLoadMenuLayout )
 	{
-
 		m_saveLoadMenuLayout->destroyWindows();
 		deleteInstance(m_saveLoadMenuLayout);
 		m_saveLoadMenuLayout = nullptr;
 
+		extern WindowLayout *saveLoadMenuLayout;
+		saveLoadMenuLayout = nullptr;
 	}
 
 	// delete the replay save menu if present
 	if( m_popupReplayLayout )
 	{
-
 		m_popupReplayLayout->destroyWindows();
 		deleteInstance(m_popupReplayLayout);
 		m_popupReplayLayout = nullptr;
-
 	}
 
 	// delete the options menu if present.
 	if (m_optionsLayout != nullptr) {
 		m_optionsLayout->destroyWindows();
 		deleteInstance(m_optionsLayout);
 		m_optionsLayout = nullptr;
+
+		extern WindowLayout *OptionsLayout;
+		OptionsLayout = nullptr;
 	}
 }
 
@@ -231,7 +236,22 @@ namespace
 //-------------------------------------------------------------------------------------------------
 void Shell::recreateWindowLayouts()
 {
-		// collect state of the current shell
+	// 1. Query the states of Quit Menu, Options Layout, and Save/Load Layout BEFORE deconstruction
+	Bool wasQuitVisible = TheInGameUI ? TheInGameUI->isQuitMenuVisible() : FALSE;
+	Bool wasOptionsVisible = (m_optionsLayout != nullptr && !m_optionsLayout->isHidden());
+	Bool wasSaveLoadVisible = (m_saveLoadMenuLayout != nullptr && !m_saveLoadMenuLayout->isHidden());
+
+	// Preserve shell active status and shell map state
+	Bool wasShellActive = m_isShellActive;
+	Bool wasShellMapOn = m_shellMapOn;
+
+	// If the quit menu was visible, we MUST destroy it cleanly so its static layouts are freed
+	if (wasQuitVisible)
+	{
+		destroyQuitMenu();
+	}
+
+	// collect state of the current shell
 	const Int screenCount = getScreenCount();
 	std::vector<ScreenInfo> screenStackInfos;
 
@@ -247,21 +267,75 @@ void Shell::recreateWindowLayouts()
 		}
 	}
 
+	m_isRecreatingLayouts = TRUE;
+
 	// reconstruct the shell now
 	deconstruct();
 	construct();
 	init();
 
+	m_isShellActive = wasShellActive;
+	m_shellMapOn = wasShellMapOn;
+
 	// restore the screen stack
 	Int screenIndex = 0;
 	for (; screenIndex < screenCount; ++screenIndex)
 	{
 		const ScreenInfo& screenInfo = screenStackInfos[screenIndex];
-		push(screenInfo.filename);
+		
+		WindowLayout *newScreen = TheWindowManager->winCreateLayout( screenInfo.filename );
+		DEBUG_ASSERTCRASH( newScreen != nullptr, ("Shell unable to load pending push layout") );
+
+		linkScreen( newScreen );
+
+		if (TheIMEManager)
+			TheIMEManager->detach();
+
+		if (!screenInfo.isHidden)
+		{
+			newScreen->runInit( nullptr );
+			newScreen->bringForward();
+		}
+
+		newScreen->hide(screenInfo.isHidden);
+	}
 
-		WindowLayout* layout = getScreenLayout(screenIndex);
-		layout->hide(screenInfo.isHidden);
+	// 3. Restore the standalone layouts if they were visible
+	if (wasQuitVisible)
+	{
+		// ToggleQuitMenu will reload the .wnd layout and cleanly recreate the Quit Menu at the new resolution
+		ToggleQuitMenu();
 	}
+
+	if (wasOptionsVisible)
+	{
+		WindowLayout *optLayout = getOptionsLayout(TRUE);
+		if (optLayout)
+		{
+			optLayout->runInit();
+			optLayout->hide(FALSE);
+			optLayout->bringForward();
+			
+			extern WindowLayout *OptionsLayout;
+			OptionsLayout = optLayout;
+		}
+	}
+
+	if (wasSaveLoadVisible)
+	{
+		WindowLayout *slLayout = getSaveLoadMenuLayout();
+		if (slLayout)
+		{
+			slLayout->runInit();
+			slLayout->hide(FALSE);
+			slLayout->bringForward();
+			
+			extern WindowLayout *saveLoadMenuLayout;
+			saveLoadMenuLayout = slLayout;
+		}
+	}
+
+	m_isRecreatingLayouts = FALSE;
 }
 
 //-------------------------------------------------------------------------------------------------
@@ -445,8 +519,11 @@ void Shell::popImmediate()
 	m_pendingPop = FALSE;
 
 	// run the shutdown
-	Bool immediatePop = TRUE;
-	screen->runShutdown( &immediatePop );
+	if (!m_isRecreatingLayouts)
+	{
+		Bool immediatePop = TRUE;
+		screen->runShutdown( &immediatePop );
+	}
 
 	// pop the screen of the stack
 	doPop( FALSE );
@@ -702,7 +779,7 @@ void Shell::doPop( Bool impendingPush )
 
 	// run the init for the new top of the stack if present
 	WindowLayout *newTop = top();
-	if( newTop && !impendingPush )
+	if( newTop && !impendingPush && !m_isRecreatingLayouts )
 	{
 		newTop->runInit( nullptr );
 		//newTop->bringForward();

Generals/Code/GameEngine/Source/GameClient/InGameUI.cpp

@@ -5822,8 +5822,18 @@ void InGameUI::resetIdleWorker()
 
 void InGameUI::recreateControlBar()
 {
-	GameWindow *win = TheWindowManager->winGetWindowFromId(nullptr, TheNameKeyGenerator->nameToKey("ControlBar.wnd"));
-	deleteInstance(win);
+	Bool wasVisible = FALSE;
+	GameWindow *parent = TheWindowManager->winGetWindowFromId(nullptr, TheNameKeyGenerator->nameToKey("ControlBar.wnd:ControlBarParent"));
+	if (parent)
+	{
+		wasVisible = !parent->winIsHidden();
+	}
+
+	GameWindow *win = TheWindowManager->winGetWindowFromId(nullptr, TheNameKeyGenerator->nameToKey("ControlBar.wnd:ControlBarParent"));
+	if (win)
+	{
+		TheWindowManager->winDestroy(win);
+	}
 
 	m_idleWorkerWin = nullptr;
 
@@ -5832,6 +5842,17 @@ void InGameUI::recreateControlBar()
 	delete TheControlBar;
 	TheControlBar = NEW ControlBar;
 	TheControlBar->init();
+
+	if (ThePlayerList && ThePlayerList->getLocalPlayer())
+	{
+		TheControlBar->setControlBarSchemeByPlayer(ThePlayerList->getLocalPlayer());
+		TheControlBar->initSpecialPowershortcutBar(ThePlayerList->getLocalPlayer());
+	}
+
+	if (wasVisible)
+	{
+		ShowControlBar(TRUE);
+	}
 }
 
 void InGameUI::refreshCustomUiResources()

Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/GUI/GUICallbacks/W3DControlBar.cpp

@@ -138,7 +138,7 @@ void W3DPowerDraw( GameWindow *window, WinInstanceData *instData )
 	window->winGetScreenPosition( &pos.x, &pos.y );
 	window->winGetSize( &size.x, &size.y );
 
-	static Real pixelsPerInterval = size.x / TheGlobalData->m_powerBarIntervals;
+	//Real pixelsPerInterval = size.x / TheGlobalData->m_powerBarIntervals;
 	Int delta = TheGlobalData->m_powerBarYellowRange;
 
 	if((consumption > energy->getProduction() - delta) && (consumption <= energy->getProduction()))
@@ -297,7 +297,7 @@ void W3DPowerDrawA( GameWindow *window, WinInstanceData *instData )
 	window->winGetScreenPosition( &pos.x, &pos.y );
 	window->winGetSize( &size.x, &size.y );
 
-	static Real pixelsPerInterval = size.x / TheGlobalData->m_powerBarIntervals;
+	//Real pixelsPerInterval = size.x / TheGlobalData->m_powerBarIntervals;
 	Int delta = TheGlobalData->m_powerBarYellowRange;
 
 	if((consumption > energy->getProduction() - delta) && (consumption <= energy->getProduction()))
@@ -627,7 +627,7 @@ void W3DCommandBarBackgroundDraw( GameWindow *window, WinInstanceData *instData
 		return;
 	static NameKeyType winNamekey	= TheNameKeyGenerator->nameToKey( "ControlBar.wnd:BackgroundMarker" );
 	GameWindow *win =  TheWindowManager->winGetWindowFromId(nullptr,winNamekey);
-	static ICoord2D basePos;
+	ICoord2D basePos;
 	if(!win)
 	{
 		return;
@@ -652,7 +652,7 @@ void W3DCommandBarForegroundDraw( GameWindow *window, WinInstanceData *instData
 
 	static NameKeyType winNamekey	= TheNameKeyGenerator->nameToKey( "ControlBar.wnd:BackgroundMarker" );
 	GameWindow *win = TheWindowManager->winGetWindowFromId(nullptr,winNamekey);
-	static ICoord2D basePos;
+	ICoord2D basePos;
 	if(!win)
 	{
 		return;