Merge pull request #14739 from volzhs/collapse_folder

Enhance FileSystem dock
This commit is contained in:
Juan Linietsky 2017-12-16 11:33:16 -03:00 committed by GitHub
commit 92a8a505a0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 2 deletions

View File

@ -129,6 +129,7 @@ void FileSystemDock::_update_tree(bool keep_collapse_state) {
}
_create_tree(root, EditorFileSystem::get_singleton()->get_filesystem(), uncollapsed_paths);
tree->ensure_cursor_is_visible();
updating_tree = false;
}
@ -592,8 +593,7 @@ void FileSystemDock::_select_file(int p_idx) {
}
path = fpath;
_update_files(false);
current_path->set_text(path);
_push_to_history();
navigate_to_path(path);
} else {
if (ResourceLoader::get_resource_type(fpath) == "PackedScene") {
editor->open_request(fpath);
@ -1219,6 +1219,9 @@ void FileSystemDock::_go_to_file_list() {
tree->hide();
file_list_vb->show();
button_favorite->hide();
} else {
bool collapsed = tree->get_selected()->is_collapsed();
tree->get_selected()->set_collapsed(!collapsed);
}
//file_options->show();