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

Merge pull request #106952 from bruvzg/fna_emb_fx

Browse Source 
Fix window embedding for windows with `force_native` enabled.
This commit is contained in:
Rémi Verschelde
2025-06-10 12:30:11 +02:00
parent d6be90983f 4877a964e4
commit 07ee1331e8
1 changed files with 6 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
scene/main/window.cpp
View File

@@ -1366,7 +1366,13 @@ void Window::set_force_native(bool p_force_native) {
if (is_visible() && !is_in_edited_scene_root()) { if (is_visible() && !is_in_edited_scene_root()) {
ERR_FAIL_MSG("Can't change \"force_native\" while a window is displayed. Consider hiding window before changing this value."); ERR_FAIL_MSG("Can't change \"force_native\" while a window is displayed. Consider hiding window before changing this value.");
} }
if (window_id == DisplayServer::MAIN_WINDOW_ID) {
return;
}
force_native = p_force_native; force_native = p_force_native;
if (!is_in_edited_scene_root() && get_tree()->get_root()->is_embedding_subwindows()) {
set_embedding_subwindows(force_native);
}
} }
bool Window::get_force_native() const { bool Window::get_force_native() const {