summaryrefslogtreecommitdiff
path: root/editor/filesystem_dock.cpp
diff options
context:
space:
mode:
authorRĂ©mi Verschelde <rverschelde@gmail.com>2017-09-13 20:20:35 +0200
committerGitHub <noreply@github.com>2017-09-13 20:20:35 +0200
commit22d9e56c7159d99101b26189aa4301a77e4e8518 (patch)
treec38e425bfe3a61eb044a7f547d0a56447e476be6 /editor/filesystem_dock.cpp
parent57a55489650faa18d785b69d2ed59314ab6faf7b (diff)
parent7b5a1f6481b8df22ffb2dd2ec713b470ffc2a980 (diff)
Merge pull request #11199 from SaracenOne/filesystem_dirs
Add option to always show directories in filesystem dock
Diffstat (limited to 'editor/filesystem_dock.cpp')
-rw-r--r--editor/filesystem_dock.cpp4
1 files changed, 3 insertions, 1 deletions
diff --git a/editor/filesystem_dock.cpp b/editor/filesystem_dock.cpp
index 69c1424403..7b7cfd2289 100644
--- a/editor/filesystem_dock.cpp
+++ b/editor/filesystem_dock.cpp
@@ -423,8 +423,10 @@ void FileSystemDock::_update_files(bool p_keep_selection) {
Ref<Texture> file_thumbnail;
Ref<Texture> file_thumbnail_broken;
+ bool always_show_folders = EditorSettings::get_singleton()->get("docks/filesystem/always_show_folders");
+
bool use_thumbnails = (display_mode == DISPLAY_THUMBNAILS);
- bool use_folders = search_box->get_text().length() == 0 && split_mode;
+ bool use_folders = search_box->get_text().length() == 0 && (split_mode || always_show_folders);
if (use_thumbnails) { //thumbnails