diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2023-12-04 23:15:18 +0100 |
|---|---|---|
| committer | Rémi Verschelde <rverschelde@gmail.com> | 2023-12-04 23:15:18 +0100 |
| commit | 7b1a5de2841c98c81b98b09d5e7363fed078b341 (patch) | |
| tree | c4fa5c86808e198752e8365b9d271982e2792901 /platform | |
| parent | c2d7cfe5387db5792a8832a58d7735969a827130 (diff) | |
| parent | 40d7320a17560222042661798baba150d30c2d91 (diff) | |
| download | redot-engine-7b1a5de2841c98c81b98b09d5e7363fed078b341.tar.gz | |
Merge pull request #85484 from Maran23/windows-popup-menu-mouse-fix
Do not consume mouse messages in windows with `no_focus` on Windows OS
Diffstat (limited to 'platform')
| -rw-r--r-- | platform/windows/display_server_windows.cpp | 4 |
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; |