diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2019-03-03 19:58:48 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-03-03 19:58:48 +0100 |
| commit | 9357d691a2b15eb11b68d1d0d3f4ead588c0f28b (patch) | |
| tree | bf2441e0912de5087b9782409786aaf826548a0a | |
| parent | 34dd77205488a3128f6bec55d8d0a7de811ba031 (diff) | |
| parent | ed7534a6aa34b12f2c7ec6eb159b7def29d0282c (diff) | |
Merge pull request #26496 from MadEqua/fix-filesystem-dock-icon
Fix grid view button icon not showing on filesystem dock.
| -rw-r--r-- | editor/editor_node.cpp | 1 | ||||
| -rw-r--r-- | editor/filesystem_dock.cpp | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/editor/editor_node.cpp b/editor/editor_node.cpp index b36afaef88..07dfcaa917 100644 --- a/editor/editor_node.cpp +++ b/editor/editor_node.cpp @@ -5659,7 +5659,6 @@ EditorNode::EditorNode() { filesystem_dock = memnew(FileSystemDock(this)); filesystem_dock->connect("open", this, "open_request"); - filesystem_dock->set_file_list_display_mode(FileSystemDock::FILE_LIST_DISPLAY_LIST); filesystem_dock->connect("instance", this, "_instance_request"); filesystem_dock->connect("display_mode_changed", this, "_save_docks"); diff --git a/editor/filesystem_dock.cpp b/editor/filesystem_dock.cpp index 9bd6063a71..66deb42c11 100644 --- a/editor/filesystem_dock.cpp +++ b/editor/filesystem_dock.cpp @@ -302,6 +302,8 @@ void FileSystemDock::_notification(int p_what) { always_show_folders = bool(EditorSettings::get_singleton()->get("docks/filesystem/always_show_folders")); + set_file_list_display_mode(FileSystemDock::FILE_LIST_DISPLAY_LIST); + _update_display_mode(); if (EditorFileSystem::get_singleton()->is_scanning()) { |