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

Resource file not found error when loading Favorite icon

Browse Source
This commit is contained in:
Per Melin
2024-03-18 12:58:05 +01:00
parent fe01776f05
commit ae6410b622
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
editor/filesystem_dock.cpp
View File

@@ -453,7 +453,7 @@ void FileSystemDock::_update_tree(const Vector<String> &p_uncollapsed_paths, boo
int index; int index;
EditorFileSystemDirectory *dir = EditorFileSystem::get_singleton()->find_file(favorite, &index); EditorFileSystemDirectory *dir = EditorFileSystem::get_singleton()->find_file(favorite, &index);
if (dir) { if (dir) {
icon = _get_tree_item_icon(dir->get_file_import_is_valid(index), dir->get_file_path(index), dir->get_file_type(index)); icon = _get_tree_item_icon(dir->get_file_import_is_valid(index), dir->get_file_type(index), _get_entry_script_icon(dir, index));
} else { } else {
icon = get_editor_theme_icon(SNAME("File")); icon = get_editor_theme_icon(SNAME("File"));
} }
@@ -1009,6 +1009,7 @@ void FileSystemDock::_update_file_list(bool p_keep_selection) {
fi.path = favorite; fi.path = favorite;
if (efd) { if (efd) {
fi.type = efd->get_file_type(index); fi.type = efd->get_file_type(index);
fi.icon_path = _get_entry_script_icon(efd, index);
fi.import_broken = !efd->get_file_import_is_valid(index); fi.import_broken = !efd->get_file_import_is_valid(index);
fi.modified_time = efd->get_file_modified_time(index); fi.modified_time = efd->get_file_modified_time(index);
} else { } else {
@@ -1101,6 +1102,7 @@ void FileSystemDock::_update_file_list(bool p_keep_selection) {
fi.name = efd->get_file(i); fi.name = efd->get_file(i);
fi.path = directory.path_join(fi.name); fi.path = directory.path_join(fi.name);
fi.type = efd->get_file_type(i); fi.type = efd->get_file_type(i);
fi.icon_path = _get_entry_script_icon(efd, i);
fi.import_broken = !efd->get_file_import_is_valid(i); fi.import_broken = !efd->get_file_import_is_valid(i);
fi.modified_time = efd->get_file_modified_time(i); fi.modified_time = efd->get_file_modified_time(i);
@@ -1118,7 +1120,6 @@ void FileSystemDock::_update_file_list(bool p_keep_selection) {
FileInfo *finfo = &(E); FileInfo *finfo = &(E);
String fname = finfo->name; String fname = finfo->name;
String fpath = finfo->path; String fpath = finfo->path;
String ftype = finfo->type;
Ref<Texture2D> type_icon; Ref<Texture2D> type_icon;
Ref<Texture2D> big_icon; Ref<Texture2D> big_icon;
@@ -1126,11 +1127,10 @@ void FileSystemDock::_update_file_list(bool p_keep_selection) {
String tooltip = fpath; String tooltip = fpath;
// Select the icons. // Select the icons.
type_icon = _get_tree_item_icon(!finfo->import_broken, finfo->type, finfo->icon_path);
if (!finfo->import_broken) { if (!finfo->import_broken) {
type_icon = (has_theme_icon(ftype, EditorStringName(EditorIcons))) ? get_editor_theme_icon(ftype) : get_editor_theme_icon(SNAME("Object"));
big_icon = file_thumbnail; big_icon = file_thumbnail;
} else { } else {
type_icon = get_editor_theme_icon(SNAME("ImportFail"));
big_icon = file_thumbnail_broken; big_icon = file_thumbnail_broken;
tooltip += "\n" + TTR("Status: Import of file failed. Please fix file and reimport manually."); tooltip += "\n" + TTR("Status: Import of file failed. Please fix file and reimport manually.");
} }