summaryrefslogtreecommitdiffstats
path: root/platform
diff options
context:
space:
mode:
authorMarius Hanl <mariushanl@web.de>2023-11-28 19:43:07 +0100
committerMarius Hanl <mariushanl@web.de>2023-11-28 19:43:07 +0100
commit40d7320a17560222042661798baba150d30c2d91 (patch)
tree187306e94e2449ae6aedf5ea30fc66c565253524 /platform
parent5df98679672c12d96b4ac4d96ee17f1559207401 (diff)
downloadredot-engine-40d7320a17560222042661798baba150d30c2d91.tar.gz
Do not consume (eat) mouse messages with no_focus Window's (Godot PopupMenu)
Window's with the no_focus flag should still process mouse events and not consume them. Otherwise all mouse pressed operations will not work inside Godot's PopupMenu. This problem is Windows only, all other platforms do process mouse events for PopupMenu's correctly.
Diffstat (limited to 'platform')
-rw-r--r--platform/windows/display_server_windows.cpp4
1 files changed, 1 insertions, 3 deletions
diff --git a/platform/windows/display_server_windows.cpp b/platform/windows/display_server_windows.cpp
index e8d81405f0..c801ca96e7 100644
--- a/platform/windows/display_server_windows.cpp
+++ b/platform/windows/display_server_windows.cpp
@@ -2958,9 +2958,7 @@ LRESULT DisplayServerWindows::WndProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARA
}
} break;
case WM_MOUSEACTIVATE: {
- if (windows[window_id].no_focus) {
- return MA_NOACTIVATEANDEAT; // Do not activate, and discard mouse messages.
- } else if (windows[window_id].is_popup) {
+ if (windows[window_id].no_focus || windows[window_id].is_popup) {
return MA_NOACTIVATE; // Do not activate, but process mouse messages.
}
} break;