Commit: b2318ef25f92f48f25cc195e7b3a65f55787811d
Author: Julian Eisel
Date: Thu Jun 4 18:13:05 2015 +0200
Branches: UI-experiments
https://developer.blender.org/rBb2318ef25f92f48f25cc195e7b3a65f55787811d
Merge branch 'UI-graphical-redesign' into UI-experiments
Conflicts:
source/blender/editors/screen/area.c
===================================================================
===================================================================
diff --cc source/blender/editors/interface/interface_widgets.c
index 56e8171,87e68db..a3c1852
--- a/source/blender/editors/interface/interface_widgets.c
+++ b/source/blender/editors/interface/interface_widgets.c
@@@ -1879,22 -1928,12 +1932,25 @@@ static struct uiWidgetColors wcol_list_
{0, 0, 0, 255},
0,
- 0, 0
+ 0, 0,
+
+ 0, /* pad */
+ 0.2f
};
+static struct uiWidgetColors wcol_tab = {
+ {255, 255, 255, 255},
+ {83, 83, 83, 255},
+ {114, 114, 114, 255},
+ {90, 90, 90, 255},
+
+ {0, 0, 0, 255},
+ {0, 0, 0, 255},
+
+ 0,
+ 0, 0
+};
+
/* free wcol struct to play with */
static struct uiWidgetColors wcol_tmp = {
{0, 0, 0, 255},
diff --cc source/blender/editors/interface/resources.c
index fa1a4ab,fead706..3b9e317
--- a/source/blender/editors/interface/resources.c
+++ b/source/blender/editors/interface/resources.c
@@@ -171,8 -171,12 +171,12 @@@ const unsigned char *UI_ThemeGetColorPt
}
switch (colorid) {
+ case TH_AREA_EDGES:
+ cp = btheme->tui.area_edges;
+ break;
+
case TH_BACK:
- if (theme_regionid == RGN_TYPE_WINDOW)
+ if (ELEM(theme_regionid,
RGN_TYPE_WINDOW, RGN_TYPE_TABS))
cp = ts->back;
else if (theme_regionid ==
RGN_TYPE_CHANNELS)
cp = ts->list;
@@@ -2643,62 -2631,21 +2631,49 @@@ void init_userdef_do_versions(void
bTheme *btheme;
ThemeSpace *ts;
+ /* interface_widgets.c */
+ struct uiWidgetColors wcol_tab = {
+ {255, 255, 255, 255},
+ {83, 83, 83, 255}, /* gets overwritten later */
+ {114, 114, 114, 255}, /* gets overwritten later */
+ {90, 90, 90, 255},
+
+ {0, 0, 0, 255}, /* gets overwritten later */
+ {0, 0, 0, 255},
+
+ 0,
+ 0, 0
+ };
+
+ for (btheme = U.themes.first; btheme; btheme = btheme->next) {
+ btheme->tui.wcol_tab = wcol_tab;
+ for (ts = UI_THEMESPACE_START(btheme); ts !=
UI_THEMESPACE_END(btheme); ts++) {
+ copy_v4_v4_char(ts->tabs.tab_active,
ts->tab_active);
+ copy_v4_v4_char(ts->tabs.tab_inactive,
ts->tab_inactive);
+ copy_v4_v4_char(ts->tabs.tab_back,
ts->tab_back);
+ copy_v4_v4_char(ts->tabs.tab_outline,
ts->tab_outline);
+ }
+ }
+ }
+
+ if (U.versionfile < 274 || (U.versionfile == 274 && U.subversionfile <
6)) {
+ bTheme *btheme;
+ ThemeSpace *ts;
+
for (btheme = U.themes.first; btheme; btheme = btheme->next) {
- btheme->tui.wcol_box.roundness = 0.2f;
- btheme->tui.wcol_list_item.roundness = 0.2f;
- btheme->tui.wcol_menu.roundness = 0.2f;
- btheme->tui.wcol_menu_back.roundness = 0.25f;
- btheme->tui.wcol_menu_item.roundness = 0.2f;
- btheme->tui.wcol_num.roundness = 0.5f;
- btheme->tui.wcol_numslider.roundness = 0.5f;
- btheme->tui.wcol_option.roundness = 0.35f;
- btheme->tui.wcol_progress.roundness = 0.2f;
- btheme->tui.wcol_pulldown.roundness = 0.2f;
- btheme->tui.wcol_radio.roundness = 0.2f;
- btheme->tui.wcol_regular.roundness = 0.2f;
- btheme->tui.wcol_scroll.roundness = 0.5f;
- btheme->tui.wcol_text.roundness = 0.2f;
- btheme->tui.wcol_toggle.roundness = 0.2f;
- btheme->tui.wcol_tool.roundness = 0.25f;
- btheme->tui.wcol_tooltip.roundness = 0.2f;
-
for (ts = UI_THEMESPACE_START(btheme); ts !=
UI_THEMESPACE_END(btheme); ts++) {
/* XXX maybe remove show_back/show_header
options? */
ts->panelcolors.show_back =
ts->panelcolors.show_header = true;
rgba_char_args_set(ts->panelcolors.back, 128,
128, 128, 255);
rgba_char_args_set(ts->panelcolors.header, 97,
97, 97, 255);
}
+
+ rgba_char_args_set_fl(btheme->tui.area_edges, 0.23f,
0.23f, 0.23f, 1.0f);
+ btheme->tui.widget_emboss[3] = 0;
+
+ ui_widget_color_init(&btheme->tui);
}
}
-
if (U.pixelsize == 0.0f)
U.pixelsize = 1.0f;
diff --cc source/blender/makesdna/DNA_userdef_types.h
index ada1225,03bc616..d512db8
--- a/source/blender/makesdna/DNA_userdef_types.h
+++ b/source/blender/makesdna/DNA_userdef_types.h
@@@ -174,9 -168,10 +175,11 @@@ typedef struct ThemeUI
uiWidgetStateColors wcol_state;
+ uiTabColors tab;
uiPanelColors panel; /* depricated, but we keep it for do_versions
(2.66.1) */
+ char area_edges[4];
+
char widget_emboss[4];
/* fac: 0 - 1 for blend factor, width in pixels */
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
