tiennm99/godot
1
0
Fork 0
mirror of https://github.com/tiennm99/godot.git synced 2026-08-06 10:21:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #61001 from derammo/derammo_popup_conditional_hide

Browse Source
This commit is contained in:
Rémi Verschelde
2022-05-17 12:56:53 +02:00
committed by GitHub
parent 129767da70 47d0dc8a41
commit ccdd85d8e7
4 changed files with 26 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/windows/display_server_windows.cpp
+5 -1
View File
@@ -2158,7 +2158,10 @@ void DisplayServerWindows::popup_close(WindowID p_window) {
WindowID win_id = E->get();
popup_list.erase(E);
_send_window_event(windows[win_id], DisplayServerWindows::WINDOW_EVENT_CLOSE_REQUEST);
if (win_id != p_window) {
// Only request close on related windows, not this window. We are already processing it.
_send_window_event(windows[win_id], DisplayServerWindows::WINDOW_EVENT_CLOSE_REQUEST);
}
E = F;
}
}
@@ -2173,6 +2176,7 @@ LRESULT DisplayServerWindows::MouseProc(int code, WPARAM wParam, LPARAM lParam)
case WM_NCRBUTTONDOWN:
case WM_NCMBUTTONDOWN:
case WM_LBUTTONDOWN:
case WM_RBUTTONDOWN:
case WM_MBUTTONDOWN: {
MOUSEHOOKSTRUCT *ms = (MOUSEHOOKSTRUCT *)lParam;
Point2i pos = Point2i(ms->pt.x, ms->pt.y);