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.
This commit is contained in:
Ton Roosendaal 2013-01-05 17:13:07 +00:00
parent 123191881b
commit 8dfe7620fb

@ -1576,14 +1576,17 @@ GHOST_TSuccess GHOST_SystemCocoa::handleMouseEvent(void *eventPtr)
}
}
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;