diff options
| author | Nicholas Bishop <nicholasbishop@gmail.com> | 2010-10-18 06:43:53 +0400 |
|---|---|---|
| committer | Nicholas Bishop <nicholasbishop@gmail.com> | 2010-10-18 06:43:53 +0400 |
| commit | 08232350d5797302e3638e69ec78657d853976aa (patch) | |
| tree | ad5ff38236343cdcb5eee6d8c6711cb1b32a1912 /source/blender/editors/interface/interface_widgets.c | |
| parent | 5b31d545dfae5ee3fd5f4a5d0e9497a1c7c2a86b (diff) | |
| parent | a6d62bf0db09ae2759fd45abb3af563fefc13690 (diff) | |
svn merge https://svn.blender.org/svnroot/bf-blender/trunk/blender -r32200:32300
Diffstat (limited to 'source/blender/editors/interface/interface_widgets.c')
| -rw-r--r-- | source/blender/editors/interface/interface_widgets.c | 16 |
1 files changed, 16 insertions, 0 deletions
diff --git a/source/blender/editors/interface/interface_widgets.c b/source/blender/editors/interface/interface_widgets.c index 08ce130a300..b892ce1ca6d 100644 --- a/source/blender/editors/interface/interface_widgets.c +++ b/source/blender/editors/interface/interface_widgets.c @@ -2278,6 +2278,9 @@ static void widget_numslider(uiBut *but, uiWidgetColors *wcol, rcti *rect, int s rect->xmax -= offs*0.75f; } +/* I think 3 is sufficient border to indicate keyed status */ +#define SWATCH_KEYED_BORDER 3 + static void widget_swatch(uiBut *but, uiWidgetColors *wcol, rcti *rect, int state, int roundboxalign) { uiWidgetBase wtb; @@ -2302,6 +2305,19 @@ static void widget_swatch(uiBut *but, uiWidgetColors *wcol, rcti *rect, int stat ui_get_but_vectorf(but, col); + if(state & (UI_BUT_ANIMATED|UI_BUT_ANIMATED_KEY|UI_BUT_DRIVEN|UI_BUT_REDALERT)) { + // draw based on state - colour for keyed etc + widgetbase_draw(&wtb, wcol); + + // inset to draw swatch colour + rect->xmin+= SWATCH_KEYED_BORDER; + rect->xmax-= SWATCH_KEYED_BORDER; + rect->ymin+= SWATCH_KEYED_BORDER; + rect->ymax-= SWATCH_KEYED_BORDER; + + round_box_edges(&wtb, roundboxalign, rect, 5.0f); + } + if (color_profile) linearrgb_to_srgb_v3_v3(col, col); |