Navy.gif/glfw
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #102 from shurcooL/patch-1

Browse Source 
Fixed OS X precise scrolling delta logic.
This commit is contained in:
Camilla Berglund 2013-07-25 03:44:36 -07:00
commit 5b8ff4a2fc
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/cocoa_window.m
View File

@ -609,7 +609,7 @@ static int translateKey(unsigned int key)
double deltaX, deltaY; double deltaX, deltaY;
#if MAC_OS_X_VERSION_MAX_ALLOWED >= 1070 #if MAC_OS_X_VERSION_MAX_ALLOWED >= 1070
if ([event respondsToSelector:@selector(hasPreciseScrollingDeltas:)]) if ([event respondsToSelector:@selector(hasPreciseScrollingDeltas)])
{ {
deltaX = [event scrollingDeltaX]; deltaX = [event scrollingDeltaX];
deltaY = [event scrollingDeltaY]; deltaY = [event scrollingDeltaY];
@ -621,12 +621,11 @@ static int translateKey(unsigned int key)
} }
} }
else else
#else #endif /*MAC_OS_X_VERSION_MAX_ALLOWED*/
{ {
deltaX = [event deltaX]; deltaX = [event deltaX];
deltaY = [event deltaY]; deltaY = [event deltaY];
} }
#endif /*MAC_OS_X_VERSION_MAX_ALLOWED*/
if (fabs(deltaX) > 0.0 || fabs(deltaY) > 0.0) if (fabs(deltaX) > 0.0 || fabs(deltaY) > 0.0)
_glfwInputScroll(window, deltaX, deltaY); _glfwInputScroll(window, deltaX, deltaY);