[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [25126] trunk/blender/source/blender/ editors/interface/interface_handlers.c: UI: curve widget tweaks

[Brecht Van Lommel]

Revision: 25126
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=25126
Author:   blendix
Date:     2009-12-04 16:32:26 +0100 (Fri, 04 Dec 2009)

Log Message:
-----------
UI: curve widget tweaks
* Make snap ctrl instead of shift
* Only enable snapping after moving a few pixels,
  otherwise too easy to do enable this by accident.
* Deselecting points with shift did not work.

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	2009-12-04 11:27:40 UTC (rev 25125)
+++ trunk/blender/source/blender/editors/interface/interface_handlers.c	2009-12-04 15:32:26 UTC (rev 25126)
@@ -2990,6 +2990,16 @@
 	offsx= cumap->curr.xmin;
 	offsy= cumap->curr.ymin;
 
+	if(snap) {
+		float d[2];
+
+		d[0]= mx - data->dragstartx;
+		d[1]= my - data->dragstarty;
+
+		if(len_v2(d) < 3.0f)
+			snap= 0;
+	}
+
 	if(data->dragsel != -1) {
 		int moved_point= 0;		/* for ctrl grid, can't use orig coords because of sorting */
 		
@@ -3126,10 +3136,13 @@
 			if(sel!= -1) {
 				/* ok, we move a point */
 				/* deselect all if this one is deselect. except if we hold shift */
-				if(event->shift==0 && (cmp[sel].flag & SELECT)==0)
+				if(event->shift==0) {
 					for(a=0; a<cuma->totpoint; a++)
 						cmp[a].flag &= ~SELECT;
-				cmp[sel].flag |= SELECT;
+					cmp[sel].flag |= SELECT;
+				}
+				else
+					cmp[sel].flag ^= SELECT;
 			}
 			else {
 				/* move the view */
@@ -3150,7 +3163,7 @@
 	else if(data->state == BUTTON_STATE_NUM_EDITING) {
 		if(event->type == MOUSEMOVE) {
 			if(mx!=data->draglastx || my!=data->draglasty) {
-				if(ui_numedit_but_CURVE(but, data, event->shift, mx, my))
+				if(ui_numedit_but_CURVE(but, data, event->ctrl, mx, my))
 					ui_numedit_apply(C, block, but, data);
 			}
 		}