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

Merge pull request #7984 from Robyt3/Editor-Layer-Lockup-Fix

Browse source 
Fix editor UI locking up when dragging groups/layers quickly
This commit is contained in:
Dennis Felsing 2024-02-17 22:29:05 +00:00 committed by GitHub
parent 886b417ed4 aded3f70a2
commit 8d2de4b8c2
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 41 additions and 33 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -3776,9 +3776,10 @@ void CEditor::RenderLayers(CUIRect LayersBox)
}; };
static int s_Operation = OP_NONE; static int s_Operation = OP_NONE;
static int s_PreviousOperation = OP_NONE; static int s_PreviousOperation = OP_NONE;
static const void *s_pDraggedButton = 0; static const void *s_pDraggedButton = nullptr;
static float s_InitialMouseY = 0; static float s_InitialMouseY = 0;
static float s_InitialCutHeight = 0; static float s_InitialCutHeight = 0;
constexpr float MinDragDistance = 5.0f;
int GroupAfterDraggedLayer = -1; int GroupAfterDraggedLayer = -1;
int LayerAfterDraggedLayer = -1; int LayerAfterDraggedLayer = -1;
bool DraggedPositionFound = false; bool DraggedPositionFound = false;
@ -3786,7 +3787,6 @@ void CEditor::RenderLayers(CUIRect LayersBox)
bool MoveGroup = false; bool MoveGroup = false;
bool StartDragLayer = false; bool StartDragLayer = false;
bool StartDragGroup = false; bool StartDragGroup = false;
bool AnyButtonActive = false;
std::vector<int> vButtonsPerGroup; std::vector<int> vButtonsPerGroup;
auto SetOperation = [](int Operation) { auto SetOperation = [](int Operation) {
@ -3794,6 +3794,10 @@ void CEditor::RenderLayers(CUIRect LayersBox)
{ {
s_PreviousOperation = s_Operation; s_PreviousOperation = s_Operation;
s_Operation = Operation; s_Operation = Operation;
if(Operation == OP_NONE)
{
s_pDraggedButton = nullptr;
}
} }
}; };
@ -3803,8 +3807,10 @@ void CEditor::RenderLayers(CUIRect LayersBox)
vButtonsPerGroup.push_back(pGroup->m_vpLayers.size() + 1); vButtonsPerGroup.push_back(pGroup->m_vpLayers.size() + 1);
} }
if(!UI()->CheckActiveItem(s_pDraggedButton)) if(s_pDraggedButton != nullptr && UI()->ActiveItem() != s_pDraggedButton)
{
SetOperation(OP_NONE); SetOperation(OP_NONE);
}
if(s_Operation == OP_LAYER_DRAG || s_Operation == OP_GROUP_DRAG) if(s_Operation == OP_LAYER_DRAG || s_Operation == OP_GROUP_DRAG)
{ {
@ -3893,11 +3899,9 @@ void CEditor::RenderLayers(CUIRect LayersBox)
bool Clicked; bool Clicked;
bool Abrupted; bool Abrupted;
if(int Result = DoButton_DraggableEx(&m_Map.m_vpGroups[g], aBuf, g == m_SelectedGroup, &Slot, &Clicked, &Abrupted, if(int Result = DoButton_DraggableEx(m_Map.m_vpGroups[g].get(), aBuf, g == m_SelectedGroup, &Slot, &Clicked, &Abrupted,
BUTTON_CONTEXT, m_Map.m_vpGroups[g]->m_Collapse ? "Select group. Shift click to select all layers. Double click to expand." : "Select group. Shift click to select all layers. Double click to collapse.", IGraphics::CORNER_R)) BUTTON_CONTEXT, m_Map.m_vpGroups[g]->m_Collapse ? "Select group. Shift click to select all layers. Double click to expand." : "Select group. Shift click to select all layers. Double click to collapse.", IGraphics::CORNER_R))
{ {
AnyButtonActive = true;
if(s_Operation == OP_NONE) if(s_Operation == OP_NONE)
{ {
s_InitialMouseY = UI()->MouseY(); s_InitialMouseY = UI()->MouseY();
@ -3909,14 +3913,14 @@ void CEditor::RenderLayers(CUIRect LayersBox)
} }
if(Abrupted) if(Abrupted)
SetOperation(OP_NONE);
if(s_Operation == OP_CLICK)
{ {
if(absolute(UI()->MouseY() - s_InitialMouseY) > 5) SetOperation(OP_NONE);
StartDragGroup = true; }
s_pDraggedButton = &m_Map.m_vpGroups[g]; if(s_Operation == OP_CLICK && absolute(UI()->MouseY() - s_InitialMouseY) > MinDragDistance)
{
StartDragGroup = true;
s_pDraggedButton = m_Map.m_vpGroups[g].get();
} }
if(s_Operation == OP_CLICK && Clicked) if(s_Operation == OP_CLICK && Clicked)
@ -3948,7 +3952,7 @@ void CEditor::RenderLayers(CUIRect LayersBox)
if(s_Operation == OP_GROUP_DRAG && Clicked) if(s_Operation == OP_GROUP_DRAG && Clicked)
MoveGroup = true; MoveGroup = true;
} }
else if(s_pDraggedButton == &m_Map.m_vpGroups[g]) else if(s_pDraggedButton == m_Map.m_vpGroups[g].get())
{ {
SetOperation(OP_NONE); SetOperation(OP_NONE);
} }
@ -4048,12 +4052,11 @@ void CEditor::RenderLayers(CUIRect LayersBox)
if(int Result = DoButton_DraggableEx(m_Map.m_vpGroups[g]->m_vpLayers[i].get(), aBuf, Checked, &Button, &Clicked, &Abrupted, if(int Result = DoButton_DraggableEx(m_Map.m_vpGroups[g]->m_vpLayers[i].get(), aBuf, Checked, &Button, &Clicked, &Abrupted,
BUTTON_CONTEXT, "Select layer. Shift click to select multiple.", IGraphics::CORNER_R)) BUTTON_CONTEXT, "Select layer. Shift click to select multiple.", IGraphics::CORNER_R))
{ {
AnyButtonActive = true;
if(s_Operation == OP_NONE) if(s_Operation == OP_NONE)
{ {
s_InitialMouseY = UI()->MouseY(); s_InitialMouseY = UI()->MouseY();
s_InitialCutHeight = s_InitialMouseY - UnscrolledLayersBox.y; s_InitialCutHeight = s_InitialMouseY - UnscrolledLayersBox.y;
SetOperation(OP_CLICK); SetOperation(OP_CLICK);
if(!Input()->ShiftIsPressed() && !IsLayerSelected) if(!Input()->ShiftIsPressed() && !IsLayerSelected)
@ -4063,11 +4066,11 @@ void CEditor::RenderLayers(CUIRect LayersBox)
} }
if(Abrupted) if(Abrupted)
SetOperation(OP_NONE);
if(s_Operation == OP_CLICK)
{ {
if(absolute(UI()->MouseY() - s_InitialMouseY) > 5) SetOperation(OP_NONE);
}
if(s_Operation == OP_CLICK && absolute(UI()->MouseY() - s_InitialMouseY) > MinDragDistance)
{ {
bool EntitiesLayerSelected = false; bool EntitiesLayerSelected = false;
for(int k : m_vSelectedLayers) for(int k : m_vSelectedLayers)
@ -4078,7 +4081,6 @@ void CEditor::RenderLayers(CUIRect LayersBox)
if(!EntitiesLayerSelected) if(!EntitiesLayerSelected)
StartDragLayer = true; StartDragLayer = true;
}
s_pDraggedButton = m_Map.m_vpGroups[g]->m_vpLayers[i].get(); s_pDraggedButton = m_Map.m_vpGroups[g]->m_vpLayers[i].get();
} }
@ -4238,7 +4240,9 @@ void CEditor::RenderLayers(CUIRect LayersBox)
static std::vector<int> s_vInitialLayerIndices; static std::vector<int> s_vInitialLayerIndices;
if(MoveLayers || MoveGroup) if(MoveLayers || MoveGroup)
{
SetOperation(OP_NONE); SetOperation(OP_NONE);
}
if(StartDragLayer) if(StartDragLayer)
{ {
SetOperation(OP_LAYER_DRAG); SetOperation(OP_LAYER_DRAG);
@ -4252,10 +4256,17 @@ void CEditor::RenderLayers(CUIRect LayersBox)
} }
if(s_Operation == OP_LAYER_DRAG || s_Operation == OP_GROUP_DRAG) if(s_Operation == OP_LAYER_DRAG || s_Operation == OP_GROUP_DRAG)
{
if(s_pDraggedButton == nullptr)
{
SetOperation(OP_NONE);
}
else
{ {
s_ScrollRegion.DoEdgeScrolling(); s_ScrollRegion.DoEdgeScrolling();
UI()->SetActiveItem(s_pDraggedButton); UI()->SetActiveItem(s_pDraggedButton);
} }
}
if(Input()->KeyPress(KEY_DOWN) && m_Dialog == DIALOG_NONE && CLineInput::GetActiveInput() == nullptr && s_Operation == OP_NONE) if(Input()->KeyPress(KEY_DOWN) && m_Dialog == DIALOG_NONE && CLineInput::GetActiveInput() == nullptr && s_Operation == OP_NONE)
{ {
@ -4338,9 +4349,6 @@ void CEditor::RenderLayers(CUIRect LayersBox)
s_ScrollRegion.End(); s_ScrollRegion.End();
if(!AnyButtonActive)
SetOperation(OP_NONE);
if(s_Operation == OP_NONE) if(s_Operation == OP_NONE)
{ {
if(s_PreviousOperation == OP_GROUP_DRAG) if(s_PreviousOperation == OP_GROUP_DRAG)