From 0e476dfd70bea50f39c45a23e94efd0cf2249643 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20M=C3=BCller?= <robytemueller@gmail.com>
Date: Thu, 22 Dec 2022 23:13:15 +0100
Subject: [PATCH] When GUI inactive, unlock mouse and don't render popup menus

When the GUI is deactivated by pressing Tab, the popup menus were still rendered, which they shouldn't be, because they belong to the GUI.

The mouse needs to be unlocked when deactivating the GUI, because it can otherwise not be moved while the GUI is inactive.
---
 src/game/editor/editor.cpp | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/game/editor/editor.cpp b/src/game/editor/editor.cpp
index b8205980f..1d5503f91 100644
--- a/src/game/editor/editor.cpp
+++ b/src/game/editor/editor.cpp
@@ -5962,7 +5962,8 @@ void CEditor::Render()
 		m_PopupEventWasActivated = true;
 	}
 
-	UiDoPopupMenu();
+	if(m_GuiActive)
+		UiDoPopupMenu();
 
 	if(m_Dialog == DIALOG_NONE && !m_MouseInsidePopup && UI()->MouseInside(&View))
 	{
@@ -6469,7 +6470,11 @@ void CEditor::OnRender()
 {
 	// toggle gui
 	if(Input()->KeyPress(KEY_TAB))
+	{
 		m_GuiActive = !m_GuiActive;
+		if(!m_GuiActive)
+			m_LockMouse = false;
+	}
 
 	if(Input()->KeyPress(KEY_F10))
 		m_ShowMousePointer = false;