Sara/behaviour-tree-test
1
0
Fork 0
Code Issues Pull requests Projects Releases 2 Packages Wiki Activity Actions

Merge pull request #5439 from samuelgrigolato/fix-filesystem-dock-min-size

Browse source 
Fix issue when switching between FileSystem and other editor docks
This commit is contained in:
Rémi Verschelde 2016-06-30 08:04:36 +02:00 • committed by GitHub
commit 3fc115e433
1 changed files with 2 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

3
tools/editor/scenes_dock.cpp
View file

@ -164,12 +164,14 @@ void ScenesDock::_notification(int p_what) {
if (split_mode) { if (split_mode) {
file_list_vb->hide(); file_list_vb->hide();
tree->set_custom_minimum_size(Size2(0,0));
tree->set_v_size_flags(SIZE_EXPAND_FILL); tree->set_v_size_flags(SIZE_EXPAND_FILL);
button_back->show(); button_back->show();
} else { } else {
tree->show(); tree->show();
file_list_vb->show(); file_list_vb->show();
tree->set_custom_minimum_size(Size2(0,200)*EDSCALE);
tree->set_v_size_flags(SIZE_FILL); tree->set_v_size_flags(SIZE_FILL);
button_back->hide(); button_back->hide();
if (!EditorFileSystem::get_singleton()->is_scanning()) { if (!EditorFileSystem::get_singleton()->is_scanning()) {
@ -1702,7 +1704,6 @@ ScenesDock::ScenesDock(EditorNode *p_editor) {
tree->set_hide_root(true); tree->set_hide_root(true);
split_box->add_child(tree); split_box->add_child(tree);
tree->set_custom_minimum_size(Size2(0,200)*EDSCALE);
tree->set_drag_forwarding(this); tree->set_drag_forwarding(this);