summaryrefslogtreecommitdiff
path: root/editor
diff options
context:
space:
mode:
authorRĂ©mi Verschelde <rverschelde@gmail.com>2017-12-21 22:25:04 +0100
committerGitHub <noreply@github.com>2017-12-21 22:25:04 +0100
commitd510c33cd84a8cfc190cb1dce4e19f033704650e (patch)
tree03aec3984690339b0264ff6d23364e7897439e79 /editor
parent750febf46ec6212fddf1232b1181047db9763bc6 (diff)
parentd9e5be1d66579738ad9d739882e8463c545a6a69 (diff)
Merge pull request #14912 from volzhs/fix-filesystem-dock
Fix open directory in FileSystem dock
Diffstat (limited to 'editor')
-rw-r--r--editor/filesystem_dock.cpp9
1 files changed, 3 insertions, 6 deletions
diff --git a/editor/filesystem_dock.cpp b/editor/filesystem_dock.cpp
index c30f077888..75e4f39e25 100644
--- a/editor/filesystem_dock.cpp
+++ b/editor/filesystem_dock.cpp
@@ -147,7 +147,7 @@ void FileSystemDock::_notification(int p_what) {
if (low_height_mode) {
- file_list_vb->hide();
+ tree->hide();
tree->set_v_size_flags(SIZE_EXPAND_FILL);
button_tree->show();
} else {
@@ -158,6 +158,7 @@ void FileSystemDock::_notification(int p_what) {
button_favorite->show();
_update_tree(true);
}
+ tree->ensure_cursor_is_visible();
if (!file_list_vb->is_visible()) {
file_list_vb->show();
@@ -345,11 +346,7 @@ void FileSystemDock::navigate_to_path(const String &p_path) {
_update_tree(true);
_update_files(false);
} else {
- if (file_name.empty()) {
- _go_to_tree();
- } else {
- _go_to_file_list();
- }
+ _go_to_file_list();
}
if (!file_name.empty()) {