Revision: 23826
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=23826
Author: damien78
Date: 2009-10-14 11:46:41 +0200 (Wed, 14 Oct 2009)
Log Message:
-----------
Cocoa : bugfix #19591
Add trackpad 2 fingers gesture handling, to have it mimicking correctly mouse
wheel, and thus zoom in/out correctly in the 3D view
Modified Paths:
--------------
trunk/blender/intern/ghost/intern/GHOST_SystemCocoa.mm
Modified: trunk/blender/intern/ghost/intern/GHOST_SystemCocoa.mm
===================================================================
--- trunk/blender/intern/ghost/intern/GHOST_SystemCocoa.mm 2009-10-14
09:40:09 UTC (rev 23825)
+++ trunk/blender/intern/ghost/intern/GHOST_SystemCocoa.mm 2009-10-14
09:46:41 UTC (rev 23826)
@@ -1153,9 +1153,12 @@
case NSScrollWheel:
{
GHOST_TInt32 delta;
- delta = [event deltaY] > 0 ? 1 : -1;
- pushEvent(new
GHOST_EventWheel(getMilliSeconds(), window, delta));
-
+
+ double deltaF = [event deltaY];
+ if (deltaF == 0.0) break; //discard trackpad
delta=0 events
+
+ delta = deltaF > 0.0 ? 1 : -1;
+ pushEvent(new GHOST_EventWheel([event
timestamp], window, delta));
}
break;
_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
