godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-12-05 17:15:09 +00:00
Code Releases Wiki Activity

Merge pull request #110066 from Giganzo/folder-color

Browse Source 
Fix folder color in FileSystem Dock when using light theme
This commit is contained in:
Thaddeus Crews
2025-10-01 13:12:41 -05:00
parent f9be832eca 12d74872a5
commit 1df6a40aa0
1 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
editor/docks/filesystem_dock.cpp
View File

@@ -1073,7 +1073,11 @@ void FileSystemDock::_update_file_list(bool p_keep_selection) {
files->set_item_metadata(-1, bd); files->set_item_metadata(-1, bd);
files->set_item_selectable(-1, false); files->set_item_selectable(-1, false);
files->set_item_icon_modulate(-1, editor_is_dark_theme ? inherited_folder_color : inherited_folder_color * ITEM_COLOR_SCALE); if (!editor_is_dark_theme && inherited_folder_color != default_folder_color) {
files->set_item_icon_modulate(-1, inherited_folder_color * ITEM_COLOR_SCALE);
} else {
files->set_item_icon_modulate(-1, inherited_folder_color);
}
} }
bool reversed = file_sort == FileSortOption::FILE_SORT_NAME_REVERSE; bool reversed = file_sort == FileSortOption::FILE_SORT_NAME_REVERSE;
@@ -1087,7 +1091,10 @@ void FileSystemDock::_update_file_list(bool p_keep_selection) {
files->add_item(dname, folder_icon, true); files->add_item(dname, folder_icon, true);
files->set_item_metadata(-1, dpath); files->set_item_metadata(-1, dpath);
Color this_folder_color = has_custom_color ? folder_colors[assigned_folder_colors[dpath]] : inherited_folder_color; Color this_folder_color = has_custom_color ? folder_colors[assigned_folder_colors[dpath]] : inherited_folder_color;
files->set_item_icon_modulate(-1, editor_is_dark_theme ? this_folder_color : this_folder_color * ITEM_COLOR_SCALE); if (!editor_is_dark_theme && this_folder_color != default_folder_color) {
this_folder_color *= ITEM_COLOR_SCALE;
}
files->set_item_icon_modulate(-1, this_folder_color);
if (previous_selection.has(dname)) { if (previous_selection.has(dname)) {
files->select(files->get_item_count() - 1, false); files->select(files->get_item_count() - 1, false);