diff options
| author | Yuri Sizov <yuris@humnom.net> | 2023-07-25 21:51:31 +0200 |
|---|---|---|
| committer | Yuri Sizov <yuris@humnom.net> | 2023-07-25 21:51:31 +0200 |
| commit | fc1b392e085ff61a729b30722aeaa9b8bfdde13b (patch) | |
| tree | e39a59bcf63a3a7ea6650f6971ef56294496fd15 | |
| parent | 000bf3733e74c990a48aa2b244adeffb59993720 (diff) | |
| parent | 0f6327b59b07a3b689f99b2f5533e6ebc801bad4 (diff) | |
| download | redot-engine-fc1b392e085ff61a729b30722aeaa9b8bfdde13b.tar.gz | |
Merge pull request #79793 from trollodel/hide_make_floating_swm
Make the single window mode check more strict
| -rw-r--r-- | editor/editor_node.cpp | 2 | ||||
| -rw-r--r-- | editor/window_wrapper.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/editor/editor_node.cpp b/editor/editor_node.cpp index 6ae56cfa9a..b81d4aac88 100644 --- a/editor/editor_node.cpp +++ b/editor/editor_node.cpp @@ -7196,7 +7196,7 @@ EditorNode::EditorNode() { dock_select->set_v_size_flags(Control::SIZE_EXPAND_FILL); 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->set_icon(theme->get_icon("MakeFloating", "EditorIcons")); dock_float->set_text(TTR("Make Floating")); diff --git a/editor/window_wrapper.cpp b/editor/window_wrapper.cpp index 3a8dbf017f..91d5aa8860 100644 --- a/editor/window_wrapper.cpp +++ b/editor/window_wrapper.cpp @@ -313,7 +313,7 @@ void WindowWrapper::set_margins_enabled(bool p_enabled) { } 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; } |