Merge pull request #106952 from bruvzg/fna_emb_fx

akien-mga · akien-mga · commit 07ee1331e847 · 2025-06-10T12:30:11.000+02:00
Fix window embedding for windows with `force_native` enabled.
diff --git a/scene/main/window.cpp b/scene/main/window.cpp
@@ -1366,7 +1366,13 @@ void Window::set_force_native(bool p_force_native) {
 	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.");
 	}
+	if (window_id == DisplayServer::MAIN_WINDOW_ID) {
+		return;
+	}
 	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 {

Original file line number	Diff line number	Diff line change
`@@ -1366,7 +1366,13 @@ void Window::set_force_native(bool p_force_native) {`
`1366`	`1366`	`if (is_visible() && !is_in_edited_scene_root()) {`
`1367`	`1367`	`ERR_FAIL_MSG("Can't change \"force_native\" while a window is displayed. Consider hiding window before changing this value.");`
`1368`	`1368`	`}`
	`1369`	`+ if (window_id == DisplayServer::MAIN_WINDOW_ID) {`
	`1370`	`+ return;`
	`1371`	`+ }`
`1369`	`1372`	`force_native = p_force_native;`
	`1373`	`+ if (!is_in_edited_scene_root() && get_tree()->get_root()->is_embedding_subwindows()) {`
	`1374`	`+ set_embedding_subwindows(force_native);`
	`1375`	`+ }`
`1370`	`1376`	`}`
`1371`	`1377`
`1372`	`1378`	`bool Window::get_force_native() const {`