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

Merge pull request #6181 from Robyt3/Editor-Popup-Fixes

Browse source 
undefined
This commit is contained in:
Dennis Felsing 2022-12-25 01:28:03 +01:00 committed by GitHub
parent 50d0ecfda8 92567ced7b
commit f9827a1c2c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
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;