Revision: 20551
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=20551
Author: ton
Date: 2009-06-01 13:31:06 +0200 (Mon, 01 Jun 2009)
Log Message:
-----------
2.5
Added new widget type in drawing and themes: "Box Backdrop", which is
in use by modifiers. Allows alpha blend, shade, etc.
It was using the general button theme for standard buttons still, to
indicate this change I made it a bit darker. Matt/Bill are invited to
tweak this default color :)
Modified Paths:
--------------
branches/blender2.5/blender/source/blender/editors/interface/interface_intern.h
branches/blender2.5/blender/source/blender/editors/interface/interface_widgets.c
branches/blender2.5/blender/source/blender/makesdna/DNA_userdef_types.h
branches/blender2.5/blender/source/blender/makesrna/intern/rna_userdef.c
Modified:
branches/blender2.5/blender/source/blender/editors/interface/interface_intern.h
===================================================================
---
branches/blender2.5/blender/source/blender/editors/interface/interface_intern.h
2009-06-01 11:07:59 UTC (rev 20550)
+++
branches/blender2.5/blender/source/blender/editors/interface/interface_intern.h
2009-06-01 11:31:06 UTC (rev 20551)
@@ -77,7 +77,8 @@
UI_WTYPE_ICON,
UI_WTYPE_SWATCH,
UI_WTYPE_RGB_PICKER,
- UI_WTYPE_NORMAL
+ UI_WTYPE_NORMAL,
+ UI_WTYPE_BOX
} uiWidgetTypeEnum;
Modified:
branches/blender2.5/blender/source/blender/editors/interface/interface_widgets.c
===================================================================
---
branches/blender2.5/blender/source/blender/editors/interface/interface_widgets.c
2009-06-01 11:07:59 UTC (rev 20550)
+++
branches/blender2.5/blender/source/blender/editors/interface/interface_widgets.c
2009-06-01 11:31:06 UTC (rev 20551)
@@ -1054,6 +1054,20 @@
25, -25
};
+static struct uiWidgetColors wcol_box= {
+ {25, 25, 25, 255},
+ {128, 128, 128, 255},
+ {100, 100, 100, 255},
+ {25, 25, 25, 255},
+
+ {0, 0, 0, 255},
+ {255, 255, 255, 255},
+
+ 0,
+ 0, 0
+};
+
+
/* called for theme init (new theme) and versions */
void ui_widget_color_init(ThemeUI *tui)
{
@@ -1069,6 +1083,7 @@
tui->wcol_pulldown= wcol_pulldown;
tui->wcol_menu_back= wcol_menu_back;
tui->wcol_menu_item= wcol_menu_item;
+ tui->wcol_box= wcol_box;
tui->iconfile[0]= 0;
}
@@ -1700,6 +1715,10 @@
wt.custom= widget_swatch;
break;
+ case UI_WTYPE_BOX:
+ wt.wcol_theme= &btheme->tui.wcol_box;
+ break;
+
case UI_WTYPE_RGB_PICKER:
break;
@@ -1842,7 +1861,11 @@
case COL:
wt= widget_type(UI_WTYPE_SWATCH);
break;
-
+
+ case ROUNDBOX:
+ wt= widget_type(UI_WTYPE_BOX);
+ break;
+
// XXX four old button types
case HSVCUBE:
ui_draw_but_HSVCUBE(but, rect);
Modified:
branches/blender2.5/blender/source/blender/makesdna/DNA_userdef_types.h
===================================================================
--- branches/blender2.5/blender/source/blender/makesdna/DNA_userdef_types.h
2009-06-01 11:07:59 UTC (rev 20550)
+++ branches/blender2.5/blender/source/blender/makesdna/DNA_userdef_types.h
2009-06-01 11:31:06 UTC (rev 20551)
@@ -124,6 +124,7 @@
uiWidgetColors wcol_regular, wcol_tool, wcol_radio, wcol_text,
wcol_option;
uiWidgetColors wcol_num, wcol_numslider;
uiWidgetColors wcol_menu, wcol_pulldown, wcol_menu_back, wcol_menu_item;
+ uiWidgetColors wcol_box;
char iconfile[80]; // FILE_MAXFILE length
Modified:
branches/blender2.5/blender/source/blender/makesrna/intern/rna_userdef.c
===================================================================
--- branches/blender2.5/blender/source/blender/makesrna/intern/rna_userdef.c
2009-06-01 11:07:59 UTC (rev 20550)
+++ branches/blender2.5/blender/source/blender/makesrna/intern/rna_userdef.c
2009-06-01 11:31:06 UTC (rev 20551)
@@ -291,6 +291,12 @@
RNA_def_property_ui_text(prop, "Slider Widget Colors", "");
RNA_def_property_update(prop, NC_WINDOW, NULL);
+ prop= RNA_def_property(srna, "wcol_box", PROP_POINTER, PROP_NEVER_NULL);
+ RNA_def_property_pointer_sdna(prop, NULL, "wcol_box");
+ RNA_def_property_struct_type(prop, "ThemeWidgetColors");
+ RNA_def_property_ui_text(prop, "Box Backdrop Colors", "");
+ RNA_def_property_update(prop, NC_WINDOW, NULL);
+
prop= RNA_def_property(srna, "wcol_menu", PROP_POINTER,
PROP_NEVER_NULL);
RNA_def_property_pointer_sdna(prop, NULL, "wcol_menu");
RNA_def_property_struct_type(prop, "ThemeWidgetColors");
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
