Changeset View
Changeset View
Standalone View
Standalone View
source/blender/editors/space_file/filelist.c
| Context not available. | |||||
| } | } | ||||
| else if (typeflag & FILE_TYPE_BLENDER) { | else if (typeflag & FILE_TYPE_BLENDER) { | ||||
| return ICON_FILE_BLEND; | return ICON_FILE_BLEND; | ||||
| } | } | ||||
| else if (is_main) { | else if (is_main) { | ||||
| /* Do not return icon for folders if icons are not 'main' draw type | /* Do not return icon for folders if icons are not 'main' draw type | ||||
| * (e.g. when used over previews). */ | * (e.g. when used over previews). */ | ||||
| return (file->attributes & FILE_ATTR_ANY_LINK) ? ICON_FOLDER_REDIRECT : ICON_FILE_FOLDER; | return (file->attributes & FILE_ATTR_ANY_LINK) ? ICON_FOLDER_REDIRECT : ICON_FILE_FOLDER; | ||||
| } | } | ||||
| else { | else { | ||||
| /* If this path is in System list then use that icon. */ | |||||
| /* If this path is in System list or cache path then use that icon. */ | |||||
| struct FSMenu *fsmenu = ED_fsmenu_get(); | struct FSMenu *fsmenu = ED_fsmenu_get(); | ||||
| FSMenuEntry *tfsm = ED_fsmenu_get_category(fsmenu, FS_CATEGORY_SYSTEM_BOOKMARKS); | FSMenuCategory cats[] = { | ||||
brecht: Don't abbreviate variable names unnecessarily. | |||||
| char fullpath[FILE_MAX_LIBEXTRA]; | FS_INTERNAL_PATH_CACHE, | ||||
| BLI_join_dirfile(fullpath, sizeof(fullpath), root, file->relpath); | FS_CATEGORY_SYSTEM_BOOKMARKS, | ||||
| BLI_add_slash(fullpath); | }; | ||||
| for (; tfsm; tfsm = tfsm->next) { | int i = ARRAY_SIZE(cats); | ||||
| if (STREQ(tfsm->path, fullpath)) { | while (i--) { | ||||
brechtUnsubmitted Not Done Inline ActionsJust structure this as a regular for loop, no need for confusing reverse iteration. for (int i = 0; i < ARRAY_SIZE(categories); i++) brecht: Just structure this as a regular for loop, no need for confusing reverse iteration.
```
for… | |||||
| /* Never want a little folder inside a large one. */ | FSMenuEntry *tfsm = ED_fsmenu_get_category(fsmenu, cats[i]); | ||||
| return (tfsm->icon == ICON_FILE_FOLDER) ? ICON_NONE : tfsm->icon; | char fullpath[FILE_MAX_LIBEXTRA]; | ||||
| BLI_join_dirfile(fullpath, sizeof(fullpath), root, file->relpath); | |||||
| BLI_add_slash(fullpath); | |||||
| for (; tfsm; tfsm = tfsm->next) { | |||||
| if (STREQ(tfsm->path, fullpath)) { | |||||
| /* Never want a little folder inside a large one. */ | |||||
| return (tfsm->icon == ICON_FILE_FOLDER) ? ICON_NONE : tfsm->icon; | |||||
| } | |||||
| } | } | ||||
| } | } | ||||
| } | } | ||||
| if (file->attributes & FILE_ATTR_ANY_LINK) { | if (file->attributes & FILE_ATTR_ANY_LINK) { | ||||
| return ICON_LOOP_FORWARDS; | return ICON_LOOP_FORWARDS; | ||||
| } | } | ||||
| else if (file->attributes & FILE_ATTR_OFFLINE) { | else if (file->attributes & FILE_ATTR_OFFLINE) { | ||||
| return ICON_ERROR; | return ICON_ERROR; | ||||
| } | } | ||||
| Context not available. | |||||
Don't abbreviate variable names unnecessarily.