Cr8-xyz/blender
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Cleanup: clang-format

Browse Source
This commit is contained in:
Campbell Barton
2020-03-06 12:39:00 +11:00
parent c19d2f2507
commit 5229448c43
1 changed files with 23 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
source/blender/editors/space_file/fsmenu.c
View File

@@ -440,8 +440,12 @@ void fsmenu_insert_entry(struct FSMenu *fsmenu,
/* On macOS we get icons and names for System Bookmarks from the FS_CATEGORY_OTHER list. */ /* On macOS we get icons and names for System Bookmarks from the FS_CATEGORY_OTHER list. */
if (ELEM(category, FS_CATEGORY_SYSTEM_BOOKMARKS, FS_CATEGORY_BOOKMARKS, FS_CATEGORY_RECENT)) { if (ELEM(category, FS_CATEGORY_SYSTEM_BOOKMARKS, FS_CATEGORY_BOOKMARKS, FS_CATEGORY_RECENT)) {
FSMenuCategory cats[] = { const FSMenuCategory cats[] = {
FS_CATEGORY_OTHER, FS_CATEGORY_SYSTEM, FS_CATEGORY_SYSTEM_BOOKMARKS, FS_CATEGORY_BOOKMARKS}; FS_CATEGORY_OTHER,
FS_CATEGORY_SYSTEM,
FS_CATEGORY_SYSTEM_BOOKMARKS,
FS_CATEGORY_BOOKMARKS,
};
int i = ARRAY_SIZE(cats); int i = ARRAY_SIZE(cats);
if (category == FS_CATEGORY_BOOKMARKS) { if (category == FS_CATEGORY_BOOKMARKS) {
i--; i--;
@@ -752,7 +756,6 @@ void fsmenu_read_system(struct FSMenu *fsmenu, int read_bookmarks)
fsmenu_add_windows_folder( fsmenu_add_windows_folder(
fsmenu, FS_CATEGORY_OTHER, &FOLDERID_SkyDrive, NULL, ICON_URL, FS_INSERT_LAST); fsmenu, FS_CATEGORY_OTHER, &FOLDERID_SkyDrive, NULL, ICON_URL, FS_INSERT_LAST);
} }
} }
#else #else
@@ -760,10 +763,18 @@ void fsmenu_read_system(struct FSMenu *fsmenu, int read_bookmarks)
{ {
/* We store some known macOS system paths and corresponding icons /* We store some known macOS system paths and corresponding icons
* and names in the FS_CATEGORY_OTHER (not displayed directly) category. */ * and names in the FS_CATEGORY_OTHER (not displayed directly) category. */
fsmenu_insert_entry(fsmenu, FS_CATEGORY_OTHER, fsmenu_insert_entry(fsmenu,
"/Library/Fonts/", IFACE_("Fonts"), ICON_FILE_FONT, FS_INSERT_LAST); FS_CATEGORY_OTHER,
fsmenu_insert_entry(fsmenu, FS_CATEGORY_OTHER, "/Library/Fonts/",
"/Applications/", IFACE_("Applications"), ICON_FILE_FOLDER, FS_INSERT_LAST); IFACE_("Fonts"),
ICON_FILE_FONT,
FS_INSERT_LAST);
fsmenu_insert_entry(fsmenu,
FS_CATEGORY_OTHER,
"/Applications/",
IFACE_("Applications"),
ICON_FILE_FOLDER,
FS_INSERT_LAST);
const char *home = BLI_getenv("HOME"); const char *home = BLI_getenv("HOME");
@@ -1002,10 +1013,10 @@ void fsmenu_read_system(struct FSMenu *fsmenu, int read_bookmarks)
/* For all platforms, we add some directories from User Preferences to /* For all platforms, we add some directories from User Preferences to
* the FS_CATEGORY_OTHER category so that these directories * the FS_CATEGORY_OTHER category so that these directories
* have the appropriate icons when they are added to the Bookmarks. */ * have the appropriate icons when they are added to the Bookmarks. */
# define FS_UDIR_PATH(dir, icon) \ #define FS_UDIR_PATH(dir, icon) \
if (strlen(dir) > 2) { \ if (strlen(dir) > 2) { \
fsmenu_insert_entry(fsmenu, FS_CATEGORY_OTHER, dir, NULL, icon, FS_INSERT_LAST); \ fsmenu_insert_entry(fsmenu, FS_CATEGORY_OTHER, dir, NULL, icon, FS_INSERT_LAST); \
} }
FS_UDIR_PATH(U.fontdir, ICON_FILE_FONT) FS_UDIR_PATH(U.fontdir, ICON_FILE_FONT)
FS_UDIR_PATH(U.textudir, ICON_FILE_IMAGE) FS_UDIR_PATH(U.textudir, ICON_FILE_IMAGE)
@@ -1013,7 +1024,7 @@ void fsmenu_read_system(struct FSMenu *fsmenu, int read_bookmarks)
FS_UDIR_PATH(U.sounddir, ICON_FILE_SOUND) FS_UDIR_PATH(U.sounddir, ICON_FILE_SOUND)
FS_UDIR_PATH(U.tempdir, ICON_TEMP) FS_UDIR_PATH(U.tempdir, ICON_TEMP)
# undef FS_UDIR_PATH #undef FS_UDIR_PATH
} }
static void fsmenu_free_category(struct FSMenu *fsmenu, FSMenuCategory category) static void fsmenu_free_category(struct FSMenu *fsmenu, FSMenuCategory category)