[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [55027] trunk/blender/source/blender/ windowmanager: Bugfix

[Ton Roosendaal]

Revision: 55027
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=55027
Author:   ton
Date:     2013-03-04 17:06:16 +0000 (Mon, 04 Mar 2013)
Log Message:
-----------
Bugfix

For 2.66a

Allow trackpad and magic mouse swipes to control brush size for circle select.
(Similar to mousewheel).

Modified Paths:
--------------
    trunk/blender/source/blender/windowmanager/intern/wm_operators.c
    trunk/blender/source/blender/windowmanager/wm_event_types.h

Modified: trunk/blender/source/blender/windowmanager/intern/wm_operators.c
===================================================================
--- trunk/blender/source/blender/windowmanager/intern/wm_operators.c	2013-03-04 16:37:05 UTC (rev 55026)
+++ trunk/blender/source/blender/windowmanager/intern/wm_operators.c	2013-03-04 17:06:16 UTC (rev 55027)
@@ -2787,7 +2787,18 @@
 			gesture_circle_apply(C, op);
 	}
 	else if (event->type == EVT_MODAL_MAP) {
+		float fac;
+		
 		switch (event->val) {
+			case GESTURE_MODAL_CIRCLE_SIZE:
+				fac = 0.3f * (event->y - event->prevy);
+				if (fac > 0)
+					rect->xmax += ceil(fac);
+				else
+					rect->xmax += floor(fac);
+				if (rect->xmax < 1) rect->xmax = 1;
+				wm_gesture_tag_redraw(C);
+				break;
 			case GESTURE_MODAL_CIRCLE_ADD:
 				rect->xmax += 2 + rect->xmax / 10;
 				wm_gesture_tag_redraw(C);
@@ -4062,6 +4073,7 @@
 		{GESTURE_MODAL_CONFIRM, "CONFIRM", 0, "Confirm", ""},
 		{GESTURE_MODAL_CIRCLE_ADD, "ADD", 0, "Add", ""},
 		{GESTURE_MODAL_CIRCLE_SUB, "SUBTRACT", 0, "Subtract", ""},
+		{GESTURE_MODAL_CIRCLE_SIZE, "SIZE", 0, "Size", ""},
 
 		{GESTURE_MODAL_SELECT,  "SELECT", 0, "Select", ""},
 		{GESTURE_MODAL_DESELECT, "DESELECT", 0, "DeSelect", ""},
@@ -4100,6 +4112,7 @@
 	WM_modalkeymap_add_item(keymap, PADMINUS, KM_PRESS, 0, 0, GESTURE_MODAL_CIRCLE_SUB);
 	WM_modalkeymap_add_item(keymap, WHEELDOWNMOUSE, KM_PRESS, 0, 0, GESTURE_MODAL_CIRCLE_ADD);
 	WM_modalkeymap_add_item(keymap, PADPLUSKEY, KM_PRESS, 0, 0, GESTURE_MODAL_CIRCLE_ADD);
+	WM_modalkeymap_add_item(keymap, MOUSEPAN, 0, 0, 0, GESTURE_MODAL_CIRCLE_SIZE);
 
 	/* assign map to operators */
 	WM_modalkeymap_assign(keymap, "VIEW3D_OT_select_circle");

Modified: trunk/blender/source/blender/windowmanager/wm_event_types.h
===================================================================
--- trunk/blender/source/blender/windowmanager/wm_event_types.h	2013-03-04 16:37:05 UTC (rev 55026)
+++ trunk/blender/source/blender/windowmanager/wm_event_types.h	2013-03-04 17:06:16 UTC (rev 55027)
@@ -384,6 +384,8 @@
 #define GESTURE_MODAL_IN			9
 #define GESTURE_MODAL_OUT			10
 
+#define GESTURE_MODAL_CIRCLE_SIZE	11 /* circle sel: size brush (for trackpad event) */
 
+
 #endif	/* __WM_EVENT_TYPES_H__ */