diff options
| author | Hugo Locurcio <hugo.locurcio@hugo.pro> | 2019-08-21 18:43:01 +0200 |
|---|---|---|
| committer | Hugo Locurcio <hugo.locurcio@hugo.pro> | 2019-08-21 18:43:01 +0200 |
| commit | e1b9004b0f1560c4c66e7682334cf870851ebd5c (patch) | |
| tree | 284f689384c8d3e888e0124debf82f5af6e9dae5 /editor/filesystem_dock.cpp | |
| parent | 99980d856bf2581ff7b86e50067a0f8814442834 (diff) | |
| download | redot-engine-e1b9004b0f1560c4c66e7682334cf870851ebd5c.tar.gz | |
Rename FileDialog's folder icon custom color to `folder_icon_modulate`
The custom color introduced in be8d569744e4eed9acb313d355d96e6989e92087
had the same name as the "folder" icon, which could cause conflicts
in the generated documentation.
The new name is also more self-explanatory.
Diffstat (limited to 'editor/filesystem_dock.cpp')
| -rw-r--r-- | editor/filesystem_dock.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/editor/filesystem_dock.cpp b/editor/filesystem_dock.cpp index 83904800e9..b7a74f0035 100644 --- a/editor/filesystem_dock.cpp +++ b/editor/filesystem_dock.cpp @@ -64,7 +64,7 @@ bool FileSystemDock::_create_tree(TreeItem *p_parent, EditorFileSystemDirectory subdirectory_item->set_text(0, dname); subdirectory_item->set_icon(0, get_icon("Folder", "EditorIcons")); - subdirectory_item->set_icon_color(0, get_color("folder", "FileDialog")); + subdirectory_item->set_icon_color(0, get_color("folder_icon_modulate", "FileDialog")); subdirectory_item->set_selectable(0, true); String lpath = p_dir->get_path(); subdirectory_item->set_metadata(0, lpath); @@ -187,7 +187,7 @@ void FileSystemDock::_update_tree(const Vector<String> &p_uncollapsed_paths, boo continue; Ref<Texture> folder_icon = get_icon("Folder", "EditorIcons"); - const Color folder_color = get_color("folder", "FileDialog"); + const Color folder_color = get_color("folder_icon_modulate", "FileDialog"); String text; Ref<Texture> icon; @@ -646,7 +646,7 @@ void FileSystemDock::_update_file_list(bool p_keep_selection) { } Ref<Texture> folder_icon = (use_thumbnails) ? folder_thumbnail : get_icon("folder", "FileDialog"); - const Color folder_color = get_color("folder", "FileDialog"); + const Color folder_color = get_color("folder_icon_modulate", "FileDialog"); // Build the FileInfo list List<FileInfo> filelist; |