Page MenuHome
Differential D234 Diff 726 source/blender/editors/interface/resources.c

Changeset View

Standalone View

View Options

source/blender/editors/interface/resources.c

Show First 20 Lines • Show All 232 Lines • ▼ Show 20 Lines else {
case TH_PANEL_SHOW_HEADER: case TH_PANEL_SHOW_HEADER:
cp = &setting; cp = &setting;
setting = ts->panelcolors.show_header; setting = ts->panelcolors.show_header;
break; break;
case TH_PANEL_SHOW_BACK: case TH_PANEL_SHOW_BACK:
cp = &setting; cp = &setting;
setting = ts->panelcolors.show_back; setting = ts->panelcolors.show_back;
break; break;
case TH_BUTBACK: case TH_BUTBACK:
campbellbartonAuthorUnsubmitted
Not Done
Inline Actions

Since these are not so common, would place last in the switch statement (at least after TH_BUTBACK***)

campbellbarton: Since these are not so common, would place last in the switch statement (at least after…
cp = ts->button; break; cp = ts->button; break;
case TH_BUTBACK_TEXT: case TH_BUTBACK_TEXT:
cp = ts->button_text; break; cp = ts->button_text; break;
case TH_BUTBACK_TEXT_HI: case TH_BUTBACK_TEXT_HI:
cp = ts->button_text_hi; break; cp = ts->button_text_hi; break;
case TH_SHADE1: case TH_SHADE1:
cp = ts->shade1; break; cp = ts->shade1; break;
▲ Show 20 Lines • Show All 375 Lines • ▼ Show 20 Lines else {
cp = ts->info_info_text; cp = ts->info_info_text;
break; break;
case TH_INFO_DEBUG: case TH_INFO_DEBUG:
cp = ts->info_debug; cp = ts->info_debug;
break; break;
case TH_INFO_DEBUG_TEXT: case TH_INFO_DEBUG_TEXT:
cp = ts->info_debug_text; cp = ts->info_debug_text;
break; break;
case TH_TAB_ACTIVE:
cp = ts->tab_active; break;
case TH_TAB_INACTIVE:
cp = ts->tab_inactive; break;
case TH_TAB_BACK:
cp = ts->tab_back; break;
case TH_TAB_OUTLINE:
cp = ts->tab_outline; break;
} }
} }
} }
return (unsigned char *)cp; return (unsigned char *)cp;
} }
/* use this call to init new bone color sets in Theme */ /* use this call to init new bone color sets in Theme */
▲ Show 20 Lines • Show All 83 Lines • ▼ Show 20 Lines// rgba_char_args_test_set(ts->panel_text_hi, 255, 255, 255, 255);
rgba_char_args_test_set(ts->button_title, 0, 0, 0, 255); rgba_char_args_test_set(ts->button_title, 0, 0, 0, 255);
rgba_char_args_test_set(ts->button_text, 0, 0, 0, 255); rgba_char_args_test_set(ts->button_text, 0, 0, 0, 255);
rgba_char_args_test_set(ts->button_text_hi, 255, 255, 255, 255); rgba_char_args_test_set(ts->button_text_hi, 255, 255, 255, 255);
rgba_char_args_test_set(ts->list, 165, 165, 165, 255); rgba_char_args_test_set(ts->list, 165, 165, 165, 255);
rgba_char_args_test_set(ts->list_title, 0, 0, 0, 255); rgba_char_args_test_set(ts->list_title, 0, 0, 0, 255);
rgba_char_args_test_set(ts->list_text, 0, 0, 0, 255); rgba_char_args_test_set(ts->list_text, 0, 0, 0, 255);
rgba_char_args_test_set(ts->list_text_hi, 255, 255, 255, 255); rgba_char_args_test_set(ts->list_text_hi, 255, 255, 255, 255);
rgba_char_args_test_set(ts->tab_active, 114, 114, 114, 255);
rgba_char_args_test_set(ts->tab_inactive, 100, 100, 100, 255);
rgba_char_args_test_set(ts->tab_back, 70, 70, 70, 255);
rgba_char_args_test_set(ts->tab_outline, 60, 60, 60, 255);
} }
static void ui_theme_init_new(bTheme *btheme) static void ui_theme_init_new(bTheme *btheme)
{ {
ThemeSpace *ts; ThemeSpace *ts;
for (ts = UI_THEMESPACE_START(btheme); ts != UI_THEMESPACE_END(btheme); ts++) { for (ts = UI_THEMESPACE_START(btheme); ts != UI_THEMESPACE_END(btheme); ts++) {
ui_theme_init_new_do(ts); ui_theme_init_new_do(ts);
▲ Show 20 Lines • Show All 44 Lines • ▼ Show 20 Linesvoid ui_theme_init_default(void)
/* space view3d */ /* space view3d */
btheme->tv3d.panelcolors.show_back = false; btheme->tv3d.panelcolors.show_back = false;
btheme->tv3d.panelcolors.show_header = false; btheme->tv3d.panelcolors.show_header = false;
rgba_char_args_set_fl(btheme->tv3d.panelcolors.back, 0.45, 0.45, 0.45, 0.5); rgba_char_args_set_fl(btheme->tv3d.panelcolors.back, 0.45, 0.45, 0.45, 0.5);
rgba_char_args_set_fl(btheme->tv3d.panelcolors.header, 0, 0, 0, 0.01); rgba_char_args_set_fl(btheme->tv3d.panelcolors.header, 0, 0, 0, 0.01);
rgba_char_args_set_fl(btheme->tv3d.back, 0.225, 0.225, 0.225, 1.0); rgba_char_args_set_fl(btheme->tv3d.back, 0.225, 0.225, 0.225, 1.0);
rgba_char_args_set(btheme->tv3d.text, 0, 0, 0, 255); rgba_char_args_set(btheme->tv3d.text, 0, 0, 0, 255);
rgba_char_args_set(btheme->tv3d.text_hi, 255, 255, 255, 255); rgba_char_args_set(btheme->tv3d.text_hi, 255, 255, 255, 255);
rgba_char_args_set(btheme->tv3d.tab_active, 114, 114, 114, 255);
campbellbartonAuthorUnsubmitted
Not Done
Inline Actions

This only sets the 3d view, as I've said before, tabs are not view3d specific, code that setups defaults shouldnt be view3d specific.

This issue here is rgba_char_args_test_set is used to set colors in ui_theme_init_new_do, remove the use of the test version so colors are always set now, this is no longer needed.

campbellbarton: This only sets the 3d view, as I've said before, tabs are not view3d specific, code that setups…
rgba_char_args_set(btheme->tv3d.tab_inactive, 100, 100, 100, 255);
rgba_char_args_set(btheme->tv3d.tab_back, 70, 70, 70, 255);
rgba_char_args_set(btheme->tv3d.tab_outline, 60, 60, 60, 255);
rgba_char_args_set_fl(btheme->tv3d.header, 0.45, 0.45, 0.45, 1.0); rgba_char_args_set_fl(btheme->tv3d.header, 0.45, 0.45, 0.45, 1.0);
rgba_char_args_set_fl(btheme->tv3d.button, 0.45, 0.45, 0.45, 0.5); rgba_char_args_set_fl(btheme->tv3d.button, 0.45, 0.45, 0.45, 0.5);
// rgba_char_args_set(btheme->tv3d.panel, 165, 165, 165, 127); // rgba_char_args_set(btheme->tv3d.panel, 165, 165, 165, 127);
rgba_char_args_set(btheme->tv3d.shade1, 160, 160, 160, 100); rgba_char_args_set(btheme->tv3d.shade1, 160, 160, 160, 100);
rgba_char_args_set(btheme->tv3d.shade2, 0x7f, 0x70, 0x70, 100); rgba_char_args_set(btheme->tv3d.shade2, 0x7f, 0x70, 0x70, 100);
rgba_char_args_set_fl(btheme->tv3d.grid, 0.251, 0.251, 0.251, 1.0); rgba_char_args_set_fl(btheme->tv3d.grid, 0.251, 0.251, 0.251, 1.0);
▲ Show 20 Lines • Show All 75 Lines • ▼ Show 20 Lines// rgba_char_args_set(btheme->tv3d.panel, 165, 165, 165, 127);
/* space buttons */ /* space buttons */
/* to have something initialized */ /* to have something initialized */
btheme->tbuts = btheme->tv3d; btheme->tbuts = btheme->tv3d;
rgba_char_args_set_fl(btheme->tbuts.back, 0.45, 0.45, 0.45, 1.0); rgba_char_args_set_fl(btheme->tbuts.back, 0.45, 0.45, 0.45, 1.0);
// rgba_char_args_set(btheme->tbuts.panel, 0x82, 0x82, 0x82, 255); // rgba_char_args_set(btheme->tbuts.panel, 0x82, 0x82, 0x82, 255);
/* graph editor */ /* graph editor */
btheme->tipo = btheme->tv3d; btheme->tipo = btheme->tv3d;
rgba_char_args_set_fl(btheme->tipo.back, 0.42, 0.42, 0.42, 1.0); rgba_char_args_set_fl(btheme->tipo.back, 0.42, 0.42, 0.42, 1.0);
rgba_char_args_set_fl(btheme->tipo.list, 0.4, 0.4, 0.4, 1.0); rgba_char_args_set_fl(btheme->tipo.list, 0.4, 0.4, 0.4, 1.0);
rgba_char_args_set(btheme->tipo.grid, 94, 94, 94, 255); rgba_char_args_set(btheme->tipo.grid, 94, 94, 94, 255);
// rgba_char_args_set(btheme->tipo.panel, 255, 255, 255, 150); // rgba_char_args_set(btheme->tipo.panel, 255, 255, 255, 150);
rgba_char_args_set(btheme->tipo.shade1, 150, 150, 150, 100); /* scrollbars */ rgba_char_args_set(btheme->tipo.shade1, 150, 150, 150, 100); /* scrollbars */
rgba_char_args_set(btheme->tipo.shade2, 0x70, 0x70, 0x70, 100); rgba_char_args_set(btheme->tipo.shade2, 0x70, 0x70, 0x70, 100);
▲ Show 20 Lines • Show All 1,448 Lines • ▼ Show 20 Lines for (btheme = U.themes.first; btheme; btheme = btheme->next) {
rgba_char_args_test_set(btheme->tinfo.info_warning, 220, 128, 96, 255); rgba_char_args_test_set(btheme->tinfo.info_warning, 220, 128, 96, 255);
rgba_char_args_test_set(btheme->tinfo.info_warning_text, 0, 0, 0, 255); rgba_char_args_test_set(btheme->tinfo.info_warning_text, 0, 0, 0, 255);
rgba_char_args_test_set(btheme->tinfo.info_info, 0, 170, 0, 255); rgba_char_args_test_set(btheme->tinfo.info_info, 0, 170, 0, 255);
rgba_char_args_test_set(btheme->tinfo.info_info_text, 0, 0, 0, 255); rgba_char_args_test_set(btheme->tinfo.info_info_text, 0, 0, 0, 255);
rgba_char_args_test_set(btheme->tinfo.info_debug, 196, 196, 196, 255); rgba_char_args_test_set(btheme->tinfo.info_debug, 196, 196, 196, 255);
rgba_char_args_test_set(btheme->tinfo.info_debug_text, 0, 0, 0, 255); rgba_char_args_test_set(btheme->tinfo.info_debug_text, 0, 0, 0, 255);
} }
} }
if (U.versionfile < 269 || (U.versionfile == 269 && U.subversionfile < 10)) {
bTheme *btheme;
for (btheme = U.themes.first; btheme; btheme = btheme->next) {
ThemeSpace *ts;
campbellbartonAuthorUnsubmitted
Not Done
Inline Actions

This only sets view3d tab background, it should set for all space types.
See UI_THEMESPACE_START/END use in this file.

campbellbarton: This only sets view3d tab background, it should set for all space types. See…
rgba_char_args_set(btheme->tv3d.tab_active, 114, 114, 114, 255);
campbellbartonAuthorUnsubmitted
Not Done
Inline Actions

This is a bit odd, just setting the ts->tab_active, etc in the for loop is more direct.

campbellbarton: This is a bit odd, just setting the ts->tab_active, etc in the for loop is more direct.
rgba_char_args_set(btheme->tv3d.tab_inactive, 100, 100, 100, 255);
rgba_char_args_set(btheme->tv3d.tab_back, 70, 70, 70, 255);
rgba_char_args_set(btheme->tv3d.tab_outline, 60, 60, 60, 255);
for (ts = UI_THEMESPACE_START(btheme); ts != UI_THEMESPACE_END(btheme); ts++) {
copy_v4_v4_char(btheme->tv3d.tab_active, ts->tab_active);
copy_v4_v4_char(btheme->tv3d.tab_inactive, ts->tab_inactive);
copy_v4_v4_char(btheme->tv3d.tab_back, ts->tab_back);
copy_v4_v4_char(btheme->tv3d.tab_outline, ts->tab_outline);
}
}
}
if (U.versionfile < 269 || (U.versionfile == 269 && U.subversionfile < 9)) { if (U.versionfile < 269 || (U.versionfile == 269 && U.subversionfile < 9)) {
bTheme *btheme; bTheme *btheme;
U.tw_size = U.tw_size * 5.0f; U.tw_size = U.tw_size * 5.0f;
/* Action Editor (and NLA Editor) - Keyframe Colors */ /* Action Editor (and NLA Editor) - Keyframe Colors */
/* Graph Editor - larger vertex size defaults */ /* Graph Editor - larger vertex size defaults */
for (btheme = U.themes.first; btheme; btheme = btheme->next) { for (btheme = U.themes.first; btheme; btheme = btheme->next) {
/* Action Editor ................. */ /* Action Editor ................. */
/* key types */ /* key types */
rgba_char_args_set(btheme->tact.keytype_keyframe, 232, 232, 232, 255); rgba_char_args_set(btheme->tact.keytype_keyframe, 232, 232, 232, 255);
▲ Show 20 Lines • Show All 59 Lines • Show Last 20 Lines