Check whether a dialog is present before FPM mode

bboudaoud-nv · bboudaoud-nv · commit ea43b41eefee · 2023-01-18T11:37:49.000-05:00
diff --git a/source/GuiElements.cpp b/source/GuiElements.cpp
@@ -806,5 +806,6 @@ void UserMenu::setVisible(bool enable) {
 void UserMenu::resumePress() {
 	if (m_config.requireUserAdd && !m_app->userAdded) return;
 	setVisible(!visible());
-	m_app->setMouseInputMode(visible() ? FPSciApp::MouseInputMode::MOUSE_CURSOR : FPSciApp::MouseInputMode::MOUSE_FPM);
+	if (visible()) m_app->setMouseInputMode(FPSciApp::MouseInputMode::MOUSE_CURSOR);					// If the window is visible always set cursor mode
+	else if (isNull(m_app->dialog)) m_app->setMouseInputMode(FPSciApp::MouseInputMode::MOUSE_FPM);		// Only revert to FPM mode if the window isn't visible and a dialog isn't present
 }

Original file line number	Diff line number	Diff line change
`@@ -806,5 +806,6 @@ void UserMenu::setVisible(bool enable) {`
`806`	`806`	`void UserMenu::resumePress() {`
`807`	`807`	`if (m_config.requireUserAdd && !m_app->userAdded) return;`
`808`	`808`	`setVisible(!visible());`
`809`		`- m_app->setMouseInputMode(visible() ? FPSciApp::MouseInputMode::MOUSE_CURSOR : FPSciApp::MouseInputMode::MOUSE_FPM);`
	`809`	`+ if (visible()) m_app->setMouseInputMode(FPSciApp::MouseInputMode::MOUSE_CURSOR); // If the window is visible always set cursor mode`
	`810`	`+ else if (isNull(m_app->dialog)) m_app->setMouseInputMode(FPSciApp::MouseInputMode::MOUSE_FPM); // Only revert to FPM mode if the window isn't visible and a dialog isn't present`
`810`	`811`	`}`