Bladeren bron

Merge pull request #85484 from Maran23/windows-popup-menu-mouse-fix

Do not consume mouse messages in windows with `no_focus` on Windows OS
Rémi Verschelde 1 jaar geleden
bovenliggende
commit
7b1a5de284
1 gewijzigde bestanden met toevoegingen van 1 en 3 verwijderingen
  1. 1 3
      platform/windows/display_server_windows.cpp

+ 1 - 3
platform/windows/display_server_windows.cpp

@@ -2958,9 +2958,7 @@ LRESULT DisplayServerWindows::WndProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARA
 			}
 			}
 		} break;
 		} break;
 		case WM_MOUSEACTIVATE: {
 		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.
 				return MA_NOACTIVATE; // Do not activate, but process mouse messages.
 			}
 			}
 		} break;
 		} break;