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

Merge pull request #9059 from dobrykafe/pr-fix-drag-nav

Browse source 
Editor: fix click drag navigation selecting quads/sounds
This commit is contained in:
Robert Müller 2024-10-01 17:51:06 +00:00 committed by GitHub
parent d8bbf6916a 2e77c4bd59
commit d3d4c187fb
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -3164,7 +3164,7 @@ void CEditor::DoMapEditor(CUIRect View)
MapView()->MapGrid()->OnRender(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) if(m_pContainerPanned == &m_MapEditorId)
{ {
// do panning // do panning
@ -3174,6 +3174,7 @@ void CEditor::DoMapEditor(CUIRect View)
s_Operation = OP_PAN_EDITOR; s_Operation = OP_PAN_EDITOR;
else else
s_Operation = OP_PAN_WORLD; s_Operation = OP_PAN_WORLD;
Ui()->SetActiveItem(&m_MapEditorId);
} }
else else
s_Operation = OP_NONE; 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 // release mouse
if(!Ui()->MouseButton(0)) if(!Ui()->MouseButton(0))
@ -3593,7 +3594,7 @@ void CEditor::DoMapEditor(CUIRect View)
MapView()->OffsetWorld({0, PanSpeed * m_MouseWorldScale}); MapView()->OffsetWorld({0, PanSpeed * m_MouseWorldScale});
} }
} }
else if(Ui()->CheckActiveItem(&m_MapEditorId)) else if(Ui()->CheckActiveItem(&m_MapEditorId) && m_pContainerPanned == nullptr)
{ {
// release mouse // release mouse
if(!Ui()->MouseButton(0)) if(!Ui()->MouseButton(0))