From 2e77c4bd590c8de6e7cfb8840390abee550da1c0 Mon Sep 17 00:00:00 2001 From: dobrykafe Date: Mon, 30 Sep 2024 22:46:56 +0200 Subject: [PATCH] fix click drag navigation selecting quads/sounds --- src/game/editor/editor.cpp | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/game/editor/editor.cpp b/src/game/editor/editor.cpp index 992533176..167ec7732 100644 --- a/src/game/editor/editor.cpp +++ b/src/game/editor/editor.cpp @@ -3164,7 +3164,7 @@ void CEditor::DoMapEditor(CUIRect View) MapView()->MapGrid()->OnRender(View); } - const bool ShouldPan = (Input()->ModifierIsPressed() && Ui()->MouseButton(0)) || Ui()->MouseButton(2); + const bool ShouldPan = Ui()->HotItem() == &m_MapEditorId && ((Input()->ModifierIsPressed() && Ui()->MouseButton(0)) || Ui()->MouseButton(2)); if(m_pContainerPanned == &m_MapEditorId) { // do panning @@ -3174,6 +3174,7 @@ void CEditor::DoMapEditor(CUIRect View) s_Operation = OP_PAN_EDITOR; else s_Operation = OP_PAN_WORLD; + Ui()->SetActiveItem(&m_MapEditorId); } else s_Operation = OP_NONE; @@ -3563,7 +3564,7 @@ void CEditor::DoMapEditor(CUIRect View) } } - if(Ui()->CheckActiveItem(&m_MapEditorId)) + if(Ui()->CheckActiveItem(&m_MapEditorId) && m_pContainerPanned == nullptr) { // release mouse if(!Ui()->MouseButton(0)) @@ -3593,7 +3594,7 @@ void CEditor::DoMapEditor(CUIRect View) MapView()->OffsetWorld({0, PanSpeed * m_MouseWorldScale}); } } - else if(Ui()->CheckActiveItem(&m_MapEditorId)) + else if(Ui()->CheckActiveItem(&m_MapEditorId) && m_pContainerPanned == nullptr) { // release mouse if(!Ui()->MouseButton(0))