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

Fix set_force_native when window is not in tree.

Browse Source
This commit is contained in:
Pāvels Nadtočajevs
2025-06-13 19:08:56 +03:00
parent 591e70ff78
commit 5ea0baab8b
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
scene/main/window.cpp
View File

@@ -1370,7 +1370,7 @@ void Window::set_force_native(bool p_force_native) {
return; return;
} }
force_native = p_force_native; force_native = p_force_native;
if (!is_in_edited_scene_root() && get_tree()->get_root()->is_embedding_subwindows()) { if (!is_in_edited_scene_root() && is_inside_tree() && get_tree()->get_root()->is_embedding_subwindows()) {
set_embedding_subwindows(force_native); set_embedding_subwindows(force_native);
} }
} }
@@ -1502,6 +1502,9 @@ void Window::_notification(int p_what) {
if (!ProjectSettings::get_singleton()->is_connected("settings_changed", callable_mp(this, &Window::_settings_changed))) { if (!ProjectSettings::get_singleton()->is_connected("settings_changed", callable_mp(this, &Window::_settings_changed))) {
ProjectSettings::get_singleton()->connect("settings_changed", callable_mp(this, &Window::_settings_changed)); ProjectSettings::get_singleton()->connect("settings_changed", callable_mp(this, &Window::_settings_changed));
} }
} else if (get_parent() && get_tree()->get_root()->is_embedding_subwindows()) {
// Is not the main window and main window is embedding.
set_embedding_subwindows(force_native);
} }
bool embedded = false; bool embedded = false;