[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [25813] trunk/blender/source/blender/ editors/interface/interface_handlers.c: Add ability to cancel/ revert dragging on color picker widgets with Escape, same as other widgets
Matt Ebb
matt at mke3.net
Thu Jan 7 22:52:06 CET 2010
Revision: 25813
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=25813
Author: broken
Date: 2010-01-07 22:52:04 +0100 (Thu, 07 Jan 2010)
Log Message:
-----------
Add ability to cancel/revert dragging on color picker widgets with Escape, same as other widgets
Modified Paths:
--------------
trunk/blender/source/blender/editors/interface/interface_handlers.c
Modified: trunk/blender/source/blender/editors/interface/interface_handlers.c
===================================================================
--- trunk/blender/source/blender/editors/interface/interface_handlers.c 2010-01-07 20:25:51 UTC (rev 25812)
+++ trunk/blender/source/blender/editors/interface/interface_handlers.c 2010-01-07 21:52:04 UTC (rev 25813)
@@ -2765,7 +2765,12 @@
}
}
else if(data->state == BUTTON_STATE_NUM_EDITING) {
- if(event->type == MOUSEMOVE) {
+ if(event->type == ESCKEY) {
+ data->cancel= 1;
+ data->escapecancel= 1;
+ button_activate_state(C, but, BUTTON_STATE_EXIT);
+ }
+ else if(event->type == MOUSEMOVE) {
if(mx!=data->draglastx || my!=data->draglasty) {
if(ui_numedit_but_HSVCUBE(but, data, mx, my))
ui_numedit_apply(C, block, but, data);
@@ -2828,8 +2833,13 @@
}
}
else if(data->state == BUTTON_STATE_NUM_EDITING) {
+ if(event->type == ESCKEY) {
+ data->cancel= 1;
+ data->escapecancel= 1;
+ button_activate_state(C, but, BUTTON_STATE_EXIT);
+ }
/* XXX hardcoded keymap check.... */
- if(event->type == WHEELDOWNMOUSE) {
+ else if(event->type == WHEELDOWNMOUSE) {
but->hsv[2]= CLAMPIS(but->hsv[2]-0.05f, 0.0f, 1.0f);
ui_set_but_hsv(but); // converts to rgb
ui_numedit_apply(C, block, but, data);
@@ -2845,9 +2855,9 @@
ui_numedit_apply(C, block, but, data);
}
}
- else if(event->type==LEFTMOUSE && event->val!=KM_PRESS)
+ else if(event->type==LEFTMOUSE && event->val!=KM_PRESS) {
button_activate_state(C, but, BUTTON_STATE_EXIT);
-
+ }
return WM_UI_HANDLER_BREAK;
}
More information about the Bf-blender-cvs
mailing list