griefith/test
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki 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

20
release/scripts/ui/space_userpref.py
View File

@@ -441,27 +441,7 @@ class USERPREF_PT_theme(bpy.types.Panel):
sub2.active = ui.shaded
sub2.itemR(ui, "shadetop")
sub2.itemR(ui, "shadedown")
ui = theme.user_interface.wcol_toolbar
layout.itemL(text="Toolbar:")
sub = layout.row()
sub1 = sub.column()
sub1.itemR(ui, "outline")
sub1.itemR(ui, "item", slider=True)
sub1 = sub.column()
sub1.itemR(ui, "inner", slider=True)
sub1.itemR(ui, "inner_sel", slider=True)
sub1 = sub.column()
sub1.itemR(ui, "text")
sub1.itemR(ui, "text_sel")
sub1 = sub.column()
sub1.itemR(ui, "shaded")
sub2 = sub1.column(align=True)
sub2.active = ui.shaded
sub2.itemR(ui, "shadetop")
sub2.itemR(ui, "shadedown")
ui = theme.user_interface.wcol_radio
layout.itemL(text="Radio Buttons:")

1
source/blender/editors/interface/interface_intern.h
View File

@@ -63,7 +63,6 @@ typedef enum {
UI_WTYPE_NUMBER,
UI_WTYPE_SLIDER,
UI_WTYPE_EXEC,
UI_WTYPE_TOOL,
/* strings */
UI_WTYPE_NAME,

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;

2
source/blender/makesdna/DNA_userdef_types.h
View File

@@ -135,7 +135,7 @@ typedef struct uiWidgetStateColors {
typedef struct ThemeUI {
/* Interface Elements (buttons, menus, icons) */
uiWidgetColors wcol_regular, wcol_tool, wcol_text, wcol_toolbar;
uiWidgetColors wcol_regular, wcol_tool, wcol_text;
uiWidgetColors wcol_radio, wcol_option, wcol_toggle;
uiWidgetColors wcol_num, wcol_numslider;
uiWidgetColors wcol_menu, wcol_pulldown, wcol_menu_back, wcol_menu_item;

7
source/blender/makesrna/intern/rna_userdef.c
View File

@@ -380,13 +380,6 @@ static void rna_def_userdef_theme_ui(BlenderRNA *brna)
RNA_def_property_ui_text(prop, "Tool Widget Colors", "");
RNA_def_property_update(prop, 0, "rna_userdef_update");
prop= RNA_def_property(srna, "wcol_toolbar", PROP_POINTER, PROP_NONE);
RNA_def_property_flag(prop, PROP_NEVER_NULL);
RNA_def_property_pointer_sdna(prop, NULL, "wcol_toolbar");
RNA_def_property_struct_type(prop, "ThemeWidgetColors");
RNA_def_property_ui_text(prop, "Tool Widget Colors", "");
RNA_def_property_update(prop, 0, "rna_userdef_update");
prop= RNA_def_property(srna, "wcol_radio", PROP_POINTER, PROP_NONE);
RNA_def_property_flag(prop, PROP_NEVER_NULL);
RNA_def_property_pointer_sdna(prop, NULL, "wcol_radio");