[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [49002] trunk/blender/source/blender/ editors/interface: holding shift with cont.
Campbell Barton
ideasman42 at gmail.com
Tue Jul 17 17:44:33 CEST 2012
Revision: 49002
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=49002
Author: campbellbarton
Date: 2012-07-17 15:44:33 +0000 (Tue, 17 Jul 2012)
Log Message:
-----------
holding shift with cont. grab now works on the hsv cube and the value slider.
Modified Paths:
--------------
trunk/blender/source/blender/editors/interface/interface_anim.c
trunk/blender/source/blender/editors/interface/interface_handlers.c
Modified: trunk/blender/source/blender/editors/interface/interface_anim.c
===================================================================
--- trunk/blender/source/blender/editors/interface/interface_anim.c 2012-07-17 15:18:02 UTC (rev 49001)
+++ trunk/blender/source/blender/editors/interface/interface_anim.c 2012-07-17 15:44:33 UTC (rev 49002)
@@ -217,8 +217,7 @@
/* this operator calls uiContextActiveProperty */
WM_operator_name_call(C, "ANIM_OT_keyframe_clear_button", WM_OP_INVOKE_DEFAULT, NULL);
}
-
-void ui_but_anim_add_driver(bContext *C)
+ void ui_but_anim_add_driver(bContext *C)
{
/* this operator calls uiContextActiveProperty */
WM_operator_name_call(C, "ANIM_OT_driver_button_add", WM_OP_INVOKE_DEFAULT, NULL);
Modified: trunk/blender/source/blender/editors/interface/interface_handlers.c
===================================================================
--- trunk/blender/source/blender/editors/interface/interface_handlers.c 2012-07-17 15:18:02 UTC (rev 49001)
+++ trunk/blender/source/blender/editors/interface/interface_handlers.c 2012-07-17 15:44:33 UTC (rev 49002)
@@ -256,9 +256,11 @@
static int ui_is_a_warp_but(uiBut *but)
{
- if (U.uiflag & USER_CONTINUOUS_MOUSE)
- if (ELEM4(but->type, NUM, NUMABS, HSVCIRCLE, TRACKPREVIEW))
+ if (U.uiflag & USER_CONTINUOUS_MOUSE) {
+ if (ELEM5(but->type, NUM, NUMABS, HSVCIRCLE, TRACKPREVIEW, HSVCUBE)) {
return TRUE;
+ }
+ }
return FALSE;
}
@@ -2636,7 +2638,7 @@
return retval;
}
-static int ui_numedit_but_SLI(uiBut *but, uiHandleButtonData *data, int shift, int ctrl, int mx)
+static int ui_numedit_but_SLI(uiBut *but, uiHandleButtonData *data, const short shift, const short ctrl, int mx)
{
float deler, f, tempf, softmin, softmax, softrange;
int temp, lvalue, changed = 0;
@@ -3091,7 +3093,7 @@
return WM_UI_HANDLER_CONTINUE;
}
-static int ui_numedit_but_HSVCUBE(uiBut *but, uiHandleButtonData *data, int mx, int my)
+static int ui_numedit_but_HSVCUBE(uiBut *but, uiHandleButtonData *data, float mx, float my, const short shift)
{
float rgb[3];
float *hsv = ui_block_hsv_get(but->block);
@@ -3108,6 +3110,13 @@
rgb_to_hsv_compat_v(rgb, hsv);
+ if (U.uiflag & USER_CONTINUOUS_MOUSE) {
+ float fac = shift ? 0.05f : 1.0f;
+ /* slow down the mouse, this is fairly picky */
+ mx = (data->dragstartx * (1.0f - fac) + mx * fac);
+ my = (data->dragstarty * (1.0f - fac) + my * fac);
+ }
+
/* relative position within box */
x = ((float)mx - but->x1) / (but->x2 - but->x1);
y = ((float)my - but->y1) / (but->y2 - but->y1);
@@ -3161,7 +3170,7 @@
return changed;
}
-static void ui_ndofedit_but_HSVCUBE(uiBut *but, uiHandleButtonData *data, wmNDOFMotionData *ndof, int shift)
+static void ui_ndofedit_but_HSVCUBE(uiBut *but, uiHandleButtonData *data, wmNDOFMotionData *ndof, const short shift)
{
float *hsv = ui_block_hsv_get(but->block);
float rgb[3];
@@ -3235,7 +3244,7 @@
button_activate_state(C, but, BUTTON_STATE_NUM_EDITING);
/* also do drag the first time */
- if (ui_numedit_but_HSVCUBE(but, data, mx, my))
+ if (ui_numedit_but_HSVCUBE(but, data, mx, my, event->shift))
ui_numedit_apply(C, block, but, data);
return WM_UI_HANDLER_BREAK;
@@ -3292,7 +3301,7 @@
}
else if (event->type == MOUSEMOVE) {
if (mx != data->draglastx || my != data->draglasty) {
- if (ui_numedit_but_HSVCUBE(but, data, mx, my))
+ if (ui_numedit_but_HSVCUBE(but, data, mx, my, event->shift))
ui_numedit_apply(C, block, but, data);
}
}
@@ -3305,7 +3314,7 @@
return WM_UI_HANDLER_CONTINUE;
}
-static int ui_numedit_but_HSVCIRCLE(uiBut *but, uiHandleButtonData *data, int mx, int my, int shift)
+static int ui_numedit_but_HSVCIRCLE(uiBut *but, uiHandleButtonData *data, float mx, float my, int shift)
{
rcti rect;
int changed = 1;
@@ -3352,7 +3361,7 @@
return changed;
}
-static void ui_ndofedit_but_HSVCIRCLE(uiBut *but, uiHandleButtonData *data, wmNDOFMotionData *ndof, int shift)
+static void ui_ndofedit_but_HSVCIRCLE(uiBut *but, uiHandleButtonData *data, wmNDOFMotionData *ndof, const short shift)
{
float *hsv = ui_block_hsv_get(but->block);
float rgb[3];
@@ -4182,7 +4191,8 @@
return WM_UI_HANDLER_CONTINUE;
}
-static int ui_numedit_but_TRACKPREVIEW(bContext *C, uiBut *but, uiHandleButtonData *data, int mx, int my, int shift)
+static int ui_numedit_but_TRACKPREVIEW(bContext *C, uiBut *but, uiHandleButtonData *data,
+ int mx, int my, const short shift)
{
MovieClipScopes *scopes = (MovieClipScopes *)but->poin;
int changed = 1;
More information about the Bf-blender-cvs
mailing list