forked from bartvdbraak/blender
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:
parent
123191881b
commit
8dfe7620fb
@ -1576,14 +1576,17 @@ GHOST_TSuccess GHOST_SystemCocoa::handleMouseEvent(void *eventPtr)
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
|
case NSEventTypeBeginGesture:
|
||||||
|
m_hasMultiTouchTrackpad = 1;
|
||||||
|
break;
|
||||||
|
case NSEventTypeEndGesture:
|
||||||
|
m_hasMultiTouchTrackpad = 0;
|
||||||
|
break;
|
||||||
|
|
||||||
case NSScrollWheel:
|
case NSScrollWheel:
|
||||||
{
|
{
|
||||||
int momentum = 0;
|
int momentum = [event momentumPhase];
|
||||||
#if MAC_OS_X_VERSION_MIN_REQUIRED >= 1070
|
|
||||||
m_hasMultiTouchTrackpad = 0;
|
|
||||||
momentum = [event momentumPhase] || [event phase];
|
|
||||||
#endif
|
|
||||||
/* standard scrollwheel case */
|
/* standard scrollwheel case */
|
||||||
if (!m_hasMultiTouchTrackpad && momentum == 0) {
|
if (!m_hasMultiTouchTrackpad && momentum == 0) {
|
||||||
GHOST_TInt32 delta;
|
GHOST_TInt32 delta;
|
||||||
|
Loading…
Reference in New Issue
Block a user