Page MenuHome
Differential D5713 Diff 18006 source/blender/editors/interface/resources.c

Changeset View

Standalone View

View Options

source/blender/editors/interface/resources.c

Show First 20 Lines • Show All 92 Lines • ▼ Show 20 Lines
cp = btheme->tui.icon_object_data; cp = btheme->tui.icon_object_data;
break; break;
case TH_ICON_MODIFIER: case TH_ICON_MODIFIER:
cp = btheme->tui.icon_modifier; cp = btheme->tui.icon_modifier;
break; break;
case TH_ICON_SHADING: case TH_ICON_SHADING:
cp = btheme->tui.icon_shading; cp = btheme->tui.icon_shading;
break; break;
case TH_ICON_FOLDER:
cp = btheme->tui.icon_folder;
break;
case TH_ICON_FUND: { case TH_ICON_FUND: {
/* Development fund icon color is not part of theme. */ /* Development fund icon color is not part of theme. */
static const uchar red[4] = {204, 48, 72, 255}; static const uchar red[4] = {204, 48, 72, 255};
cp = red; cp = red;
break; break;
} }
case TH_SCROLL_TEXT: case TH_SCROLL_TEXT:
▲ Show 20 Lines • Show All 184 Lines • ▼ Show 20 Lines
{ {
if (colorid == 0) { if (colorid == 0) {
return false; return false;
} }
else if (colorid == TH_ICON_FUND) { else if (colorid == TH_ICON_FUND) {
/* Always color development fund icon. */ /* Always color development fund icon. */
} }
else if (!((theme_spacetype == SPACE_OUTLINER && theme_regionid == RGN_TYPE_WINDOW) || else if (!((theme_spacetype == SPACE_OUTLINER && theme_regionid == RGN_TYPE_WINDOW) ||
(theme_spacetype == SPACE_PROPERTIES && theme_regionid == RGN_TYPE_NAV_BAR))) { (theme_spacetype == SPACE_PROPERTIES && theme_regionid == RGN_TYPE_NAV_BAR) ||
/* Only colored icons in outliner and popups, overall UI is intended (theme_spacetype == SPACE_FILE && theme_regionid == RGN_TYPE_WINDOW))) {
/* Only colored icons in specific places, overall UI is intended
SeverinUnsubmitted
Not Done
Inline Actions

Would update comment to say "Only colored icons in specific places, overall UI...".

Severin: Would update comment to say "Only colored icons in specific places, overall UI...".
* to stay monochrome and out of the way except a few places where it * to stay monochrome and out of the way except a few places where it
* is important to communicate different data types. */ * is important to communicate different data types. */
return false; return false;
} }
const uchar *cp = UI_ThemeGetColorPtr(theme_active, theme_spacetype, colorid); const uchar *cp = UI_ThemeGetColorPtr(theme_active, theme_spacetype, colorid);
col[0] = cp[0]; col[0] = cp[0];
col[1] = cp[1]; col[1] = cp[1];
▲ Show 20 Lines • Show All 92 Lines • Show Last 20 Lines