diff options
author | Campbell Barton <ideasman42@gmail.com> | 2010-10-28 15:49:56 +0400 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2010-10-28 15:49:56 +0400 |
commit | e205a9a1422c73b415be3d2e5bb98979655621ce (patch) | |
tree | 4f1d72365c889cfa340f71035dd8dda270a9bfcd /source/blender/editors/interface | |
parent | b7c8df231bd04b17b1e7b9965d247b7b62fa06d2 (diff) |
for the color picker functions use UI_GRAD_* constants rather then numbers, no functional change.
Diffstat (limited to 'source/blender/editors/interface')
-rw-r--r-- | source/blender/editors/interface/interface_handlers.c | 62 | ||||
-rw-r--r-- | source/blender/editors/interface/interface_templates.c | 2 | ||||
-rw-r--r-- | source/blender/editors/interface/interface_widgets.c | 2 |
3 files changed, 34 insertions, 32 deletions
diff --git a/source/blender/editors/interface/interface_handlers.c b/source/blender/editors/interface/interface_handlers.c index 5dbeb08d45b..70091a712c6 100644 --- a/source/blender/editors/interface/interface_handlers.c +++ b/source/blender/editors/interface/interface_handlers.c @@ -29,6 +29,7 @@ #include <stdlib.h> #include <string.h> #include <ctype.h> +#include <assert.h> #include "MEM_guardedalloc.h" @@ -2991,42 +2992,43 @@ static int ui_numedit_but_HSVCUBE(uiBut *but, uiHandleButtonData *data, int mx, y= ((float)my-but->y1)/(but->y2-but->y1); CLAMP(x, 0.0, 1.0); CLAMP(y, 0.0, 1.0); - - if(but->a1==0) { - hsv[2]= x; - hsv[1]= y; - } - else if(but->a1==1) { - hsv[0]= x; - hsv[2]= y; - } - else if(but->a1==2) { - hsv[0]= x; - hsv[1]= y; - } - else if(but->a1==3) { - hsv[0]= x; - } - else if(but->a1==4) { - hsv[1]= x; - } - else if(but->a1==5) { - hsv[2]= x; - } - else if (but->a1==9){ - float range; - - /* vertical 'value' strip */ + switch((int)but->a1) { + case UI_GRAD_SV: + hsv[2]= x; + hsv[1]= y; + break; + case UI_GRAD_HV: + hsv[0]= x; + hsv[2]= y; + break; + case UI_GRAD_HS: + hsv[0]= x; + hsv[1]= y; + break; + case UI_GRAD_SV + 3: + hsv[0]= x; + break; + case UI_GRAD_HV + 3: + hsv[1]= x; + break; + case UI_GRAD_HS + 3: + hsv[2]= x; + break; + case UI_GRAD_V_ALT: + /* vertical 'value' strip */ + /* exception only for value strip - use the range set in but->min/max */ - range = but->softmax - but->softmin; - hsv[2] = y*range + but->softmin; + hsv[2] = y * (but->softmax - but->softmin) + but->softmin; if (color_profile) hsv[2] = srgb_to_linearrgb(hsv[2]); if (hsv[2] > but->softmax) hsv[2] = but->softmax; + break; + default: + assert(!"invalid hsv type"); } hsv_to_rgb(hsv[0], hsv[1], hsv[2], rgb, rgb+1, rgb+2); @@ -3061,7 +3063,7 @@ static int ui_do_but_HSVCUBE(bContext *C, uiBlock *block, uiBut *but, uiHandleBu return WM_UI_HANDLER_BREAK; } else if (event->type == ZEROKEY && event->val == KM_PRESS) { - if (but->a1==9){ + if (but->a1==UI_GRAD_V_ALT){ int len; /* reset only value */ @@ -4429,7 +4431,7 @@ static int ui_do_button(bContext *C, uiBlock *block, uiBut *but, wmEvent *event) retval= ui_do_but_BUT(C, but, data, event); break; case COL: - if(but->a1 == 9) // signal to prevent calling up color picker + if(but->a1 == UI_GRAD_V_ALT) // signal to prevent calling up color picker retval= ui_do_but_EXIT(C, but, data, event); else retval= ui_do_but_BLOCK(C, but, data, event); diff --git a/source/blender/editors/interface/interface_templates.c b/source/blender/editors/interface/interface_templates.c index bbbb5bec7c0..7dbd2b8dd13 100644 --- a/source/blender/editors/interface/interface_templates.c +++ b/source/blender/editors/interface/interface_templates.c @@ -1821,7 +1821,7 @@ void uiTemplateColorWheel(uiLayout *layout, PointerRNA *ptr, char *propname, int uiItemS(row); if (value_slider) - uiDefButR(block, HSVCUBE, 0, "", WHEEL_SIZE+6, 0, 14, WHEEL_SIZE, ptr, propname, -1, softmin, softmax, 9, 0, ""); + uiDefButR(block, HSVCUBE, 0, "", WHEEL_SIZE+6, 0, 14, WHEEL_SIZE, ptr, propname, -1, softmin, softmax, UI_GRAD_V_ALT, 0, ""); } /********************* Layer Buttons Template ************************/ diff --git a/source/blender/editors/interface/interface_widgets.c b/source/blender/editors/interface/interface_widgets.c index ed7284bf264..644bb50fca4 100644 --- a/source/blender/editors/interface/interface_widgets.c +++ b/source/blender/editors/interface/interface_widgets.c @@ -2905,7 +2905,7 @@ void ui_draw_but(const bContext *C, ARegion *ar, uiStyle *style, uiBut *but, rct break; case HSVCUBE: - if(but->a1==9) // vertical V slider, uses new widget draw now + if(but->a1 == UI_GRAD_V_ALT) // vertical V slider, uses new widget draw now ui_draw_but_HSV_v(but, rect); else // other HSV pickers... ui_draw_but_HSVCUBE(but, rect); |