archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

Revert toolbar shading commit.

Browse Source
This commit is contained in:
William Reynish
2009-11-19 09:57:04 +00:00
parent 169b0cbee9
commit 040c2affa6
5 changed files with 5 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
source/blender/editors/interface/interface_widgets.c
View File

@@ -1153,8 +1153,7 @@ static struct uiWidgetColors wcol_radio= {
15, -15
};
// buttons in the toolbar
static struct uiWidgetColors wcol_toolbar= {
static struct uiWidgetColors wcol_regular= {
{25, 25, 25, 255},
{153, 153, 153, 255},
{100, 100, 100, 255},
@@ -1167,7 +1166,6 @@ static struct uiWidgetColors wcol_toolbar= {
0, 0
};
// other action buttons
static struct uiWidgetColors wcol_tool= {
{25, 25, 25, 255},
{153, 153, 153, 255},
@@ -1251,9 +1249,8 @@ static struct uiWidgetColors wcol_tmp= {
/* called for theme init (new theme) and versions */
void ui_widget_color_init(ThemeUI *tui)
{
tui->wcol_regular= wcol_toggle;
tui->wcol_regular= wcol_regular;
tui->wcol_tool= wcol_tool;
tui->wcol_toolbar= wcol_toolbar;
tui->wcol_text= wcol_text;
tui->wcol_radio= wcol_radio;
tui->wcol_option= wcol_option;
@@ -2280,11 +2277,6 @@ static uiWidgetType *widget_type(uiWidgetTypeEnum type)
wt.wcol_theme= &btheme->tui.wcol_tool;
wt.draw= widget_roundbut;
break;
case UI_WTYPE_TOOL:
wt.wcol_theme= &btheme->tui.wcol_toolbar;
wt.draw= widget_roundbut;
break;
/* strings */
@@ -2458,12 +2450,9 @@ void ui_draw_but(const bContext *C, ARegion *ar, uiStyle *style, uiBut *but, rct
break;
case BUT:
if (!(but->flag & UI_HAS_ICON)) {
wt= widget_type(UI_WTYPE_TOOL);
but->flag |= UI_TEXT_LEFT;
}
else {
wt= widget_type(UI_WTYPE_EXEC);
if (!(but->flag & UI_HAS_ICON)) {
but->flag |= UI_TEXT_LEFT;
}
break;