forked from bartvdbraak/blender
Revert change from Jens, wrong pointer check in the code.
That change made all scrollwheel events be handled as if it was a swipe gesture. Old style mouse wheel didn't work anymore. This version should work for everyone, but we need more mac testers :)
This commit is contained in:
parent
b3d365289f
commit
fde101c50c
@ -1577,21 +1577,15 @@ GHOST_TSuccess GHOST_SystemCocoa::handleMouseEvent(void *eventPtr)
|
||||
}
|
||||
break;
|
||||
|
||||
case NSEventTypeBeginGesture:
|
||||
m_hasMultiTouchTrackpad = true;
|
||||
break;
|
||||
case NSEventTypeEndGesture:
|
||||
m_hasMultiTouchTrackpad = false;
|
||||
break;
|
||||
|
||||
case NSScrollWheel:
|
||||
{
|
||||
int momentum = 0;
|
||||
#if MAC_OS_X_VERSION_MIN_REQUIRED >= 1070
|
||||
momentum = [event momentumPhase];
|
||||
m_hasMultiTouchTrackpad = 0;
|
||||
momentum = [event momentumPhase] || [event phase];
|
||||
#endif
|
||||
/* standard scrollwheel case, NULL check address !!! of momentum */
|
||||
if (!m_hasMultiTouchTrackpad && &momentum == NULL) {
|
||||
/* standard scrollwheel case */
|
||||
if (!m_hasMultiTouchTrackpad && momentum == 0) {
|
||||
GHOST_TInt32 delta;
|
||||
|
||||
double deltaF = [event deltaY];
|
||||
|
Loading…
Reference in New Issue
Block a user