edg-l/ddnet
1
0
Fork 0
mirror of https://github.com/ddnet/ddnet.git synced 2024-09-20 01:24:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

When GUI inactive, unlock mouse and don't render popup menus

Browse source 
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.
This commit is contained in:
Robert Müller 2022-12-22 23:13:15 +01:00
parent ac592b2a54
commit 0e476dfd70
1 changed files with 6 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/game/editor/editor.cpp
View file

@ -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;