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

Fix issues when closing multiple editor popups at the same time

Browse source 
When using `UiClosePopupMenus` in a popup handler, the number of popups was first set to `0` and then decremented to `-1` due to the popup itself being closed, which causes the next popup to not open correctly and may also cause a crash due to an out-of-bounds access.

The `UiClosePopupMenus` function is adjusted so the number of open popups never goes below `0`.

Another check is added to ensure that `UI()->SetActiveItem(nullptr)` is only called when a popup is open, so the currently active item is not reset if no popup is open.

Duplicate code in `UiDoPopupMenu` is reduced by calling the `UiClosePopupMenus` function to only close the top-most popup.

This also fixes the same issue when a popup is closed by the popup handler and the escape key in the same frame, by only handling the escape key for closing the top-most popup when the popup was not already closed by the handler.

Lastly, the explicit escape key handling is removed from the event popup, as this also caused the above issue and is not necessary, as the escape key is already handled implicitly for all popups.
This commit is contained in:
Robert Müller 2022-12-24 11:57:03 +01:00
parent 50d0ecfda8
commit 92567ced7b
2 changed files with 10 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/game/editor/editor.h
View file

@ -1096,7 +1096,7 @@ public:
void UiInvokePopupMenu(void *pID, int Flags, float X, float Y, float W, float H, int (*pfnFunc)(CEditor *pEditor, CUIRect Rect, void *pContext), void *pContext = nullptr); void UiInvokePopupMenu(void *pID, int Flags, float X, float Y, float W, float H, int (*pfnFunc)(CEditor *pEditor, CUIRect Rect, void *pContext), void *pContext = nullptr);
void UiDoPopupMenu(); void UiDoPopupMenu();
void UiClosePopupMenus(); void UiClosePopupMenus(int Menus = 0);
bool UiPopupExists(void *pID); bool UiPopupExists(void *pID);
bool UiPopupOpen(); bool UiPopupOpen();

27
src/game/editor/popups.cpp
View file

@ -86,29 +86,20 @@ void CEditor::UiDoPopupMenu()
r.Draw(ColorRGBA(0, 0, 0, 0.75f), Corners, 3.0f); r.Draw(ColorRGBA(0, 0, 0, 0.75f), Corners, 3.0f);
r.Margin(4.0f, &r); r.Margin(4.0f, &r);
if(s_UiPopups[i].m_pfnFunc(this, r, s_UiPopups[i].m_pContext)) if(s_UiPopups[i].m_pfnFunc(this, r, s_UiPopups[i].m_pContext) || Input()->KeyPress(KEY_ESCAPE))
{ UiClosePopupMenus(1);
m_LockMouse = false;
UI()->SetActiveItem(nullptr);
g_UiNumPopups--;
m_PopupEventWasActivated = false;
}
if(Input()->KeyPress(KEY_ESCAPE))
{
m_LockMouse = false;
UI()->SetActiveItem(nullptr);
g_UiNumPopups--;
m_PopupEventWasActivated = false;
}
} }
} }
void CEditor::UiClosePopupMenus() void CEditor::UiClosePopupMenus(int Menus)
{ {
if(Menus <= 0)
Menus = g_UiNumPopups;
if(Menus <= 0)
return;
m_LockMouse = false; m_LockMouse = false;
UI()->SetActiveItem(nullptr); UI()->SetActiveItem(nullptr);
g_UiNumPopups = 0; g_UiNumPopups = maximum(0, g_UiNumPopups - Menus);
m_PopupEventWasActivated = false; m_PopupEventWasActivated = false;
} }
@ -1252,7 +1243,7 @@ int CEditor::PopupEvent(CEditor *pEditor, CUIRect View, void *pContext)
if(pEditor->m_PopupEventType != POPEVENT_LARGELAYER && pEditor->m_PopupEventType != POPEVENT_PREVENTUNUSEDTILES && pEditor->m_PopupEventType != POPEVENT_IMAGEDIV16 && pEditor->m_PopupEventType != POPEVENT_IMAGE_MAX) if(pEditor->m_PopupEventType != POPEVENT_LARGELAYER && pEditor->m_PopupEventType != POPEVENT_PREVENTUNUSEDTILES && pEditor->m_PopupEventType != POPEVENT_IMAGEDIV16 && pEditor->m_PopupEventType != POPEVENT_IMAGE_MAX)
{ {
static int s_AbortButton = 0; static int s_AbortButton = 0;
if(pEditor->DoButton_Editor(&s_AbortButton, "Abort", 0, &Label, 0, nullptr) || pEditor->Input()->KeyPress(KEY_ESCAPE)) if(pEditor->DoButton_Editor(&s_AbortButton, "Abort", 0, &Label, 0, nullptr))
{ {
pEditor->m_PopupEventWasActivated = false; pEditor->m_PopupEventWasActivated = false;
return 1; return 1;