Cr8-xyz/blender
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Revert change from Jens, wrong pointer check in the code.

Browse Source 
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:
Ton Roosendaal
2012-12-30 10:38:56 +00:00
parent b3d365289f
commit fde101c50c
1 changed files with 4 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
intern/ghost/intern/GHOST_SystemCocoa.mm
View File

@@ -1577,21 +1577,15 @@ GHOST_TSuccess GHOST_SystemCocoa::handleMouseEvent(void *eventPtr)
} }
break; break;
case NSEventTypeBeginGesture:
m_hasMultiTouchTrackpad = true;
break;
case NSEventTypeEndGesture:
m_hasMultiTouchTrackpad = false;
break;
case NSScrollWheel: case NSScrollWheel:
{ {
int momentum = 0; int momentum = 0;
#if MAC_OS_X_VERSION_MIN_REQUIRED >= 1070 #if MAC_OS_X_VERSION_MIN_REQUIRED >= 1070
momentum = [event momentumPhase]; m_hasMultiTouchTrackpad = 0;
momentum = [event momentumPhase] || [event phase];
#endif #endif
/* standard scrollwheel case, NULL check address !!! of momentum */ /* standard scrollwheel case */
if (!m_hasMultiTouchTrackpad && &momentum == NULL) { if (!m_hasMultiTouchTrackpad && momentum == 0) {
GHOST_TInt32 delta; GHOST_TInt32 delta;
double deltaF = [event deltaY]; double deltaF = [event deltaY];