[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [53591] trunk/blender/intern/ghost/intern/ GHOST_SystemCocoa.mm: New version of code to detect whether a wheel is involved, or a trackpad.

Ton Roosendaal ton at blender.org
Sat Jan 5 18:13:11 CET 2013


Revision: 53591
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=53591
Author:   ton
Date:     2013-01-05 17:13:07 +0000 (Sat, 05 Jan 2013)
Log Message:
-----------
New version of code to detect whether a wheel is involved, or a trackpad.

It was compiled with "deploy target 10.6" tested on macbook with 10.8.
More tests follow quick.

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	2013-01-05 15:50:51 UTC (rev 53590)
+++ trunk/blender/intern/ghost/intern/GHOST_SystemCocoa.mm	2013-01-05 17:13:07 UTC (rev 53591)
@@ -1576,14 +1576,17 @@
 				}
 			}
 			break;
+		case NSEventTypeBeginGesture:
+			m_hasMultiTouchTrackpad = 1;
+			break;
+		case NSEventTypeEndGesture:
+			m_hasMultiTouchTrackpad = 0;
+			break;
 			
 		case NSScrollWheel:
 			{
-				int momentum = 0;
-#if MAC_OS_X_VERSION_MIN_REQUIRED >= 1070
-				m_hasMultiTouchTrackpad = 0;
-				momentum = [event momentumPhase] || [event phase];
-#endif
+				int momentum = [event momentumPhase];
+
 				/* standard scrollwheel case */
 				if (!m_hasMultiTouchTrackpad && momentum == 0) {
 					GHOST_TInt32 delta;




More information about the Bf-blender-cvs mailing list