godotengine
/
godot
mirror of https://github.com/godotengine/godot
1
0
Fork 0
Code

Fix Embedded Game does not focus when mouse over on Windows

This commit is contained in:
Hilderin 2025-02-19 17:49:28 -05:00
parent e567f49cbb
commit c7bc322bf6
2 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
editor/plugins/embedded_process.cpp
View File

@ -321,11 +321,16 @@ 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()) {
// 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.
last_updated_embedded_process_focused = false;

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);
}