Sara/behaviour-tree-test
1
0
Fork 0
Code Issues Pull requests Projects Releases 2 Packages Wiki Activity Actions

Merge pull request #115129 from KoBeWi/the_favorite_color_is_doomed_(was)

Browse source 
Fix folder colors in Favorites list
This commit is contained in:
Thaddeus Crews 2026-02-19 19:20:40 -06:00
commit 5ce11b3c5f
No known key found for this signature in database
GPG key ID: 8C6E5FEB5FC03CCC
1 changed files with 8 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

21
editor/docks/filesystem_dock.cpp
View file

@ -1067,6 +1067,13 @@ void FileSystemDock::_update_file_list(bool p_keep_selection) {
if (searched_tokens.is_empty() || _matches_all_search_tokens(text)) {
files->add_item(text, icon, true);
files->set_item_metadata(-1, favorite);
const Color folder_color = FileSystemDock::get_dir_icon_color(favorite, default_folder_color);
if (!editor_is_dark_icon_and_font && folder_color != default_folder_color) {
files->set_item_icon_modulate(-1, folder_color * ITEM_COLOR_SCALE);
} else {
files->set_item_icon_modulate(-1, folder_color);
}
}
} else {
int index;
@ -1116,19 +1123,7 @@ void FileSystemDock::_update_file_list(bool p_keep_selection) {
} else {
if (display_mode == DISPLAY_MODE_TREE_ONLY || always_show_folders) {
// Check for a folder color to inherit (if one is assigned).
Color inherited_folder_color = default_folder_color;
String color_scan_dir = directory;
while (color_scan_dir != "res://" && inherited_folder_color == default_folder_color) {
if (!color_scan_dir.ends_with("/")) {
color_scan_dir += "/";
}
if (assigned_folder_colors.has(color_scan_dir)) {
inherited_folder_color = folder_colors[assigned_folder_colors[color_scan_dir]];
}
color_scan_dir = color_scan_dir.rstrip("/").get_base_dir();
}
const Color inherited_folder_color = FileSystemDock::get_dir_icon_color(directory, default_folder_color);
// Display folders in the list.
if (directory != "res://") {