diff options
| author | Rémi Verschelde <remi@verschelde.fr> | 2023-05-26 14:06:04 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-05-26 14:06:04 +0200 |
| commit | d984ad64d440320e40e85dbcb79b8e9240f75493 (patch) | |
| tree | 802204c06ee794ed3c20ee24626e9c95c9b92b0b | |
| parent | 95d745f8dc76a76592ecc391282ccf490de75078 (diff) | |
| parent | 8eb076a6302e468b3b496e1edb77f31556a9ec22 (diff) | |
| download | redot-engine-d984ad64d440320e40e85dbcb79b8e9240f75493.tar.gz | |
Merge pull request #77509 from KoBeWi/a_whole_new_tree_of_possibilities_unfolds_before_you
Uncollapse `res://` by default
| -rw-r--r-- | editor/editor_node.cpp | 17 |
1 files changed, 14 insertions, 3 deletions
diff --git a/editor/editor_node.cpp b/editor/editor_node.cpp index 10c260310f..aada8915be 100644 --- a/editor/editor_node.cpp +++ b/editor/editor_node.cpp @@ -4842,8 +4842,13 @@ void EditorNode::_load_editor_layout() { Ref<ConfigFile> config; config.instantiate(); Error err = config->load(EditorPaths::get_singleton()->get_project_settings_dir().path_join("editor_layout.cfg")); - if (err != OK) { - // No config. + if (err != OK) { // No config. + // If config is not found, expand the res:// folder by default. + TreeItem *root = FileSystemDock::get_singleton()->get_tree_control()->get_item_with_metadata("res://", 0); + if (root) { + root->set_collapsed(false); + } + if (overridden_default_layout >= 0) { _layout_menu_option(overridden_default_layout); } @@ -5110,8 +5115,14 @@ void EditorNode::_load_docks_from_config(Ref<ConfigFile> p_layout, const String } // Restore collapsed state of FileSystemDock. + PackedStringArray uncollapsed_tis; if (p_layout->has_section_key(p_section, "dock_filesystem_uncollapsed_paths")) { - PackedStringArray uncollapsed_tis = p_layout->get_value(p_section, "dock_filesystem_uncollapsed_paths"); + uncollapsed_tis = p_layout->get_value(p_section, "dock_filesystem_uncollapsed_paths"); + } else { + uncollapsed_tis = { "res://" }; + } + + if (!uncollapsed_tis.is_empty()) { for (int i = 0; i < uncollapsed_tis.size(); i++) { TreeItem *uncollapsed_ti = FileSystemDock::get_singleton()->get_tree_control()->get_item_with_metadata(uncollapsed_tis[i], 0); if (uncollapsed_ti) { |