Nixyri/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2024-10-23 05:31:54 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Merge pull request #89673 from bruvzg/f_na_ed

Browse Source 
Do not apply `force_native` to the edited scene windows.
This commit is contained in:
Rémi Verschelde 2024-03-25 13:16:03 +01:00 committed by GitHub
commit d66539e485
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
scene/main/window.cpp
View File

@ -1213,7 +1213,7 @@ void Window::set_force_native(bool p_force_native) {
return; return;
} }
force_native = p_force_native; force_native = p_force_native;
if (is_visible()) { if (is_visible() && !is_in_edited_scene_root()) {
WARN_PRINT("Can't change \"force_native\" while a window is displayed. Consider hiding window before changing this value."); WARN_PRINT("Can't change \"force_native\" while a window is displayed. Consider hiding window before changing this value.");
} }
} }
@ -1224,7 +1224,7 @@ bool Window::get_force_native() const {
Viewport *Window::get_embedder() const { Viewport *Window::get_embedder() const {
ERR_READ_THREAD_GUARD_V(nullptr); ERR_READ_THREAD_GUARD_V(nullptr);
if (force_native && DisplayServer::get_singleton()->has_feature(DisplayServer::FEATURE_SUBWINDOWS)) { if (force_native && DisplayServer::get_singleton()->has_feature(DisplayServer::FEATURE_SUBWINDOWS) && !is_in_edited_scene_root()) {
return nullptr; return nullptr;
} }