1berry/godotengine
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #103052 from Hilderin/fix-embedded-game-mouse-over-not-focused-windows

Browse Source 
Fix Embedded Game does not focus when mouse over on Windows
This commit is contained in:
Rémi Verschelde 2025-02-23 12:12:47 +01:00
commit 05c56e8393
No known key found for this signature in database
GPG Key ID: C3336907360768E1
2 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
editor/plugins/embedded_process.cpp
View File

@ -321,10 +321,15 @@ void EmbeddedProcess::_check_mouse_over() {
return;
}
// When there's a modal window, we don't want to grab the focus to prevent
// the game window to go in front of the modal window.
if (_get_current_modal_window()) {
return;
// Check if there's an exclusive popup, an open menu, or a tooltip.
// We don't want to grab focus to prevent the game window from coming to the front of the modal window
// or the open menu from closing when the mouse cursor moves outside the menu and over the embedded game.
Vector<DisplayServer::WindowID> wl = DisplayServer::get_singleton()->get_window_list();
for (const DisplayServer::WindowID &window_id : wl) {
Window *w = Window::get_from_id(window_id);
if (w && (w->is_exclusive() || w->get_flag(Window::FLAG_POPUP))) {
return;
}
}
// Force "regrabbing" the game window focus.

1
platform/windows/display_server_windows.cpp
View File

@ -3000,6 +3000,7 @@ Error DisplayServerWindows::embed_process(WindowID p_window, OS::ProcessID p_pid
}
if (p_grab_focus) {
SetForegroundWindow(ep->window_handle);
SetFocus(ep->window_handle);
}