godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-11-29 16:16:38 +00:00
Code Releases Wiki Activity

Merge pull request #101135 from Hilderin/fix-embedding-not-working-intermittently

Browse Source 
Fix embedding failing intermittently
This commit is contained in:
Rémi Verschelde
2025-01-06 22:49:05 +01:00
parent 0f76ee4688 2f061df7b0
commit cc32e46360
2 changed files with 4 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
platform/linuxbsd/x11/display_server_x11.cpp
View File

@@ -5720,7 +5720,7 @@ Error DisplayServerX11::embed_process(WindowID p_window, OS::ProcessID p_pid, co
} }
} }
if (desired_rect.size.x < 100 || desired_rect.size.y < 100) { if (desired_rect.size.x <= 100 || desired_rect.size.y <= 100) {
p_visible = false; p_visible = false;
} }

22
platform/windows/display_server_windows.cpp
View File

@@ -2877,11 +2877,8 @@ static BOOL CALLBACK _enum_proc_find_window_from_process_id_callback(HWND hWnd,
GetWindowThreadProcessId(hWnd, &process_id); GetWindowThreadProcessId(hWnd, &process_id);
if (ed.process_id == process_id) { if (ed.process_id == process_id) {
if (GetParent(hWnd) != ed.parent_hWnd) { if (GetParent(hWnd) != ed.parent_hWnd) {
const DWORD style = GetWindowLongPtr(hWnd, GWL_STYLE);
if ((style & WS_VISIBLE) != WS_VISIBLE) {
return TRUE; return TRUE;
} }
}
// Found it. // Found it.
ed.hWnd = hWnd; ed.hWnd = hWnd;
@@ -2936,24 +2933,9 @@ Error DisplayServerWindows::embed_process(WindowID p_window, OS::ProcessID p_pid
ep->is_visible = (style & WS_VISIBLE) == WS_VISIBLE; ep->is_visible = (style & WS_VISIBLE) == WS_VISIBLE;
embedded_processes.insert(p_pid, ep); embedded_processes.insert(p_pid, ep);
HWND old_parent = GetParent(ep->window_handle);
if (old_parent != wd.hWnd) {
// It's important that the window does not have the WS_CHILD flag
// to prevent the current process from interfering with the embedded process.
// I observed lags and issues with mouse capture when WS_CHILD is set.
// Additionally, WS_POPUP must be set to ensure that the coordinates of the embedded
// window remain screen coordinates and not local coordinates of the parent window.
if ((style & WS_CHILD) == WS_CHILD || (style & WS_POPUP) != WS_POPUP) {
const DWORD new_style = (style & ~WS_CHILD) | WS_POPUP;
SetWindowLong(ep->window_handle, GWL_STYLE, new_style);
}
// Set the parent to current window.
SetParent(ep->window_handle, wd.hWnd);
}
} }
if (p_rect.size.x < 100 || p_rect.size.y < 100) { if (p_rect.size.x <= 100 || p_rect.size.y <= 100) {
p_visible = false; p_visible = false;
} }
@@ -2962,7 +2944,7 @@ Error DisplayServerWindows::embed_process(WindowID p_window, OS::ProcessID p_pid
// (e.g., a screen to the left of the main screen). // (e.g., a screen to the left of the main screen).
const Rect2i adjusted_rect = Rect2i(p_rect.position + _get_screens_origin(), p_rect.size); const Rect2i adjusted_rect = Rect2i(p_rect.position + _get_screens_origin(), p_rect.size);
SetWindowPos(ep->window_handle, HWND_BOTTOM, adjusted_rect.position.x, adjusted_rect.position.y, adjusted_rect.size.x, adjusted_rect.size.y, SWP_NOZORDER | SWP_NOACTIVATE); SetWindowPos(ep->window_handle, nullptr, adjusted_rect.position.x, adjusted_rect.position.y, adjusted_rect.size.x, adjusted_rect.size.y, SWP_NOZORDER | SWP_NOACTIVATE | SWP_ASYNCWINDOWPOS);
if (ep->is_visible != p_visible) { if (ep->is_visible != p_visible) {
if (p_visible) { if (p_visible) {