Bläddra i källkod

Make the single window mode check more strict

Check the "interface/editor/single_window_mode" editor settings.
trollodel 2 år sedan
förälder
incheckning
0f6327b59b
2 ändrade filer med 2 tillägg och 2 borttagningar
  1. 1 1
      editor/editor_node.cpp
  2. 1 1
      editor/window_wrapper.cpp

+ 1 - 1
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"));

+ 1 - 1
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;
 	}