summaryrefslogtreecommitdiff
path: root/tools
diff options
context:
space:
mode:
authorSamuel Grigolato <samuel.grigolato@gmail.com>2016-06-26 17:03:42 -0300
committerSamuel Grigolato <samuel.grigolato@gmail.com>2016-06-26 19:21:40 -0300
commitf55dc6d0b6a0407fa9f88e38169fe1d216969f74 (patch)
tree137e4cd4c9093fe7976dda1436b228b3861873b2 /tools
parent10f411b47bd46fc28f780be9f70c20228ef4428c (diff)
Fix issue when switching between FileSystem and other editor docks. #5384
Diffstat (limited to 'tools')
-rw-r--r--tools/editor/scenes_dock.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/tools/editor/scenes_dock.cpp b/tools/editor/scenes_dock.cpp
index cbd7df9d18..0df4dfacc1 100644
--- a/tools/editor/scenes_dock.cpp
+++ b/tools/editor/scenes_dock.cpp
@@ -164,12 +164,14 @@ void ScenesDock::_notification(int p_what) {
if (split_mode) {
file_list_vb->hide();
+ tree->set_custom_minimum_size(Size2(0,0));
tree->set_v_size_flags(SIZE_EXPAND_FILL);
button_back->show();
} else {
tree->show();
file_list_vb->show();
+ tree->set_custom_minimum_size(Size2(0,200)*EDSCALE);
tree->set_v_size_flags(SIZE_FILL);
button_back->hide();
if (!EditorFileSystem::get_singleton()->is_scanning()) {
@@ -1702,7 +1704,6 @@ 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);