diff options
| author | Rémi Verschelde <remi@verschelde.fr> | 2016-06-30 08:04:36 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-06-30 08:04:36 +0200 |
| commit | 3fc115e4338a80d58ffd9b6ddfbf6ddb01e01b2b (patch) | |
| tree | 89f518e014434e9d7b408a62ada0f433f56670f0 /tools | |
| parent | da2f7e3c3847e1a50ca7cca2575b56288f865b7b (diff) | |
| parent | f55dc6d0b6a0407fa9f88e38169fe1d216969f74 (diff) | |
Merge pull request #5439 from samuelgrigolato/fix-filesystem-dock-min-size
Fix issue when switching between FileSystem and other editor docks
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/editor/scenes_dock.cpp | 3 |
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); |