Revision: 23860
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=23860
Author: aligorith
Date: 2009-10-15 13:52:23 +0200 (Thu, 15 Oct 2009)
Log Message:
-----------
Num Sliders Tweak:
The dark bar for sliders will now be drawn in a way that takes into account the
state of the slider (this includes info about keyframing and/or drivers). This
means no more ambiguarity about whether these sliders are animated or not!
I've had to make a little hack here to make sure that the sliders bar will
still be visible after the state has been blended, but this should probably be
solved nicer by adding a separate setting for blending-factor in this case.
Modified Paths:
--------------
trunk/blender/source/blender/editors/interface/interface_widgets.c
Modified: trunk/blender/source/blender/editors/interface/interface_widgets.c
===================================================================
--- trunk/blender/source/blender/editors/interface/interface_widgets.c
2009-10-15 11:11:52 UTC (rev 23859)
+++ trunk/blender/source/blender/editors/interface/interface_widgets.c
2009-10-15 11:52:23 UTC (rev 23860)
@@ -1262,6 +1262,35 @@
}
}
+/* sliders use special hack which sets 'item' as inner when drawing filling */
+static void widget_state_numslider(uiWidgetType *wt, int state)
+{
+ uiWidgetStateColors *wcol_state= wt->wcol_state;
+ float blend= wcol_state->blend - 0.2f; // XXX special tweak to make
sure that bar will still be visible
+
+ /* call this for option button */
+ widget_state(wt, state);
+
+ /* now, set the inner-part so that it reflects state settings too */
+ // TODO: maybe we should have separate settings for the blending colors
used for this case?
+ if(state & UI_SELECT) {
+ if(state & UI_BUT_ANIMATED_KEY)
+ widget_state_blend(wt->wcol.item,
wcol_state->inner_key_sel, blend);
+ else if(state & UI_BUT_ANIMATED)
+ widget_state_blend(wt->wcol.item,
wcol_state->inner_anim_sel, blend);
+ else if(state & UI_BUT_DRIVEN)
+ widget_state_blend(wt->wcol.item,
wcol_state->inner_driven_sel, blend);
+ }
+ else {
+ if(state & UI_BUT_ANIMATED_KEY)
+ widget_state_blend(wt->wcol.item,
wcol_state->inner_key, blend);
+ else if(state & UI_BUT_ANIMATED)
+ widget_state_blend(wt->wcol.item,
wcol_state->inner_anim, blend);
+ else if(state & UI_BUT_DRIVEN)
+ widget_state_blend(wt->wcol.item,
wcol_state->inner_driven, blend);
+ }
+}
+
/* labels use theme colors for text */
static void widget_state_label(uiWidgetType *wt, int state)
{
@@ -2192,6 +2221,7 @@
case UI_WTYPE_SLIDER:
wt.wcol_theme= &btheme->tui.wcol_numslider;
wt.custom= widget_numslider;
+ wt.state= widget_state_numslider;
break;
case UI_WTYPE_EXEC:
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
