Merge pull request godotengine#95972 from Hilderin/fix-mouse-move-over-unfocused-window

Repiteo · Repiteo · commit ddb2073c5cc2 · 2024-11-13T08:34:30.000-06:00
Fix mouse move over an unfocused window
diff --git a/platform/windows/display_server_windows.cpp b/platform/windows/display_server_windows.cpp
@@ -4792,9 +4792,12 @@ LRESULT DisplayServerWindows::WndProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARA
 				break;
 			}
 
-			DisplayServer::WindowID receiving_window_id = _get_focused_window_or_popup();
-			if (receiving_window_id == INVALID_WINDOW_ID) {
-				receiving_window_id = window_id;
+			DisplayServer::WindowID receiving_window_id = window_id;
+			if (mouse_mode == MOUSE_MODE_CAPTURED || mouse_mode == MOUSE_MODE_CONFINED || mouse_mode == MOUSE_MODE_CONFINED_HIDDEN) {
+				receiving_window_id = _get_focused_window_or_popup();
+				if (receiving_window_id == INVALID_WINDOW_ID) {
+					receiving_window_id = window_id;
+				}
 			}
 
 			const BitField<WinKeyModifierMask> &mods = _get_mods();

Original file line number	Diff line number	Diff line change
`@@ -4792,9 +4792,12 @@ LRESULT DisplayServerWindows::WndProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARA`
`4792`	`4792`	`break;`
`4793`	`4793`	`}`
`4794`	`4794`
`4795`		`- DisplayServer::WindowID receiving_window_id = _get_focused_window_or_popup();`
`4796`		`- if (receiving_window_id == INVALID_WINDOW_ID) {`
`4797`		`- receiving_window_id = window_id;`
	`4795`	`+ DisplayServer::WindowID receiving_window_id = window_id;`
	`4796`	`+ if (mouse_mode == MOUSE_MODE_CAPTURED \|\| mouse_mode == MOUSE_MODE_CONFINED \|\| mouse_mode == MOUSE_MODE_CONFINED_HIDDEN) {`
	`4797`	`+ receiving_window_id = _get_focused_window_or_popup();`
	`4798`	`+ if (receiving_window_id == INVALID_WINDOW_ID) {`
	`4799`	`+ receiving_window_id = window_id;`
	`4800`	`+ }`
`4798`	`4801`	`}`
`4799`	`4802`
`4800`	`4803`	`const BitField<WinKeyModifierMask> &mods = _get_mods();`