Make the single window mode check more strict
Check the "interface/editor/single_window_mode" editor settings.
(cherry picked from commit 0f6327b59b
)
This commit is contained in:
parent
788ee7938b
commit
5e8654decb
|
@ -7155,7 +7155,7 @@ EditorNode::EditorNode() {
|
||||||
dock_select->set_v_size_flags(Control::SIZE_EXPAND_FILL);
|
dock_select->set_v_size_flags(Control::SIZE_EXPAND_FILL);
|
||||||
dock_vb->add_child(dock_select);
|
dock_vb->add_child(dock_select);
|
||||||
|
|
||||||
if (!SceneTree::get_singleton()->get_root()->is_embedding_subwindows() && EDITOR_GET("interface/multi_window/enable")) {
|
if (!SceneTree::get_singleton()->get_root()->is_embedding_subwindows() && !EDITOR_GET("interface/editor/single_window_mode") && EDITOR_GET("interface/multi_window/enable")) {
|
||||||
dock_float = memnew(Button);
|
dock_float = memnew(Button);
|
||||||
dock_float->set_icon(theme->get_icon("MakeFloating", "EditorIcons"));
|
dock_float->set_icon(theme->get_icon("MakeFloating", "EditorIcons"));
|
||||||
dock_float->set_text(TTR("Make Floating"));
|
dock_float->set_text(TTR("Make Floating"));
|
||||||
|
|
|
@ -313,7 +313,7 @@ void WindowWrapper::set_margins_enabled(bool p_enabled) {
|
||||||
}
|
}
|
||||||
|
|
||||||
WindowWrapper::WindowWrapper() {
|
WindowWrapper::WindowWrapper() {
|
||||||
if (SceneTree::get_singleton()->get_root()->is_embedding_subwindows() || !EDITOR_GET("interface/multi_window/enable")) {
|
if (SceneTree::get_singleton()->get_root()->is_embedding_subwindows() || EDITOR_GET("interface/editor/single_window_mode") || !EDITOR_GET("interface/multi_window/enable")) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue