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

Prevent editor shortcuts when a dialog is open

Browse source
This commit is contained in:
furo 2023-09-15 11:15:22 +02:00
parent ab5834278f
commit 321622b66b
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1483,7 +1483,7 @@ void CEditor::DoQuad(CQuad *pQuad, int Index)
Graphics()->SetColor(1, 1, 1, 1); Graphics()->SetColor(1, 1, 1, 1);
} }
else if(Input()->KeyPress(KEY_R) && !m_vSelectedQuads.empty()) else if(Input()->KeyPress(KEY_R) && !m_vSelectedQuads.empty() && m_Dialog == DIALOG_NONE)
{ {
UI()->EnableMouseLock(pID); UI()->EnableMouseLock(pID);
UI()->SetActiveItem(pID); UI()->SetActiveItem(pID);
@ -5699,7 +5699,7 @@ void CEditor::RenderEnvelopeEditor(CUIRect View)
ToolBar.VSplitLeft(40.0f, &Button, &ToolBar); ToolBar.VSplitLeft(40.0f, &Button, &ToolBar);
UI()->DoLabel(&Button, "Sync.", 10.0f, TEXTALIGN_ML); UI()->DoLabel(&Button, "Sync.", 10.0f, TEXTALIGN_ML);
if(UI()->MouseInside(&View)) if(UI()->MouseInside(&View) && m_Dialog == DIALOG_NONE)
{ {
UI()->SetHotItem(&s_EnvelopeEditorID); UI()->SetHotItem(&s_EnvelopeEditorID);