summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJuan Linietsky <reduzio@gmail.com>2016-06-26 13:33:03 -0300
committerGitHub <noreply@github.com>2016-06-26 13:33:03 -0300
commit5b96496a99fccee6fe890810758a88c4ad9d9d6d (patch)
tree830c888a7e91622c1857e0f2070515303cd922ab
parent5dbb587c0ffe35940505a3216e0fc56b063a3b31 (diff)
parent3668bdc93e30410741bb22dbd2b1735126e75a48 (diff)
Merge pull request #5431 from godotengine/revert-5416-master
Revert "Fix issue when switching between FileSystem and other editor docks"
-rw-r--r--tools/editor/scenes_dock.cpp1
1 files changed, 1 insertions, 0 deletions
diff --git a/tools/editor/scenes_dock.cpp b/tools/editor/scenes_dock.cpp
index 68bf504fe2..44832c84eb 100644
--- a/tools/editor/scenes_dock.cpp
+++ b/tools/editor/scenes_dock.cpp
@@ -1702,6 +1702,7 @@ ScenesDock::ScenesDock(EditorNode *p_editor) {
tree->set_hide_root(true);
split_box->add_child(tree);
+ tree->set_custom_minimum_size(Size2(0,200)*EDSCALE);
tree->set_drag_forwarding(this);