Zengtudor/glfw
1
0
Fork 0
mirror of https://github.com/glfw/glfw.git synced 2025-06-14 19:52:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge cb0089b839 into 4ff8095dee

Browse Source
This commit is contained in:
Patrick Walton 2013-09-13 05:44:22 -07:00
commit b3f4515de1
1 changed files with 15 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/cocoa_window.m
View File

@ -29,6 +29,11 @@
// Needed for _NSGetProgname
#include <crt_externs.h>
@interface NSEvent (DeviceDelta)
- (bool)_continuousScroll;
- (CGFloat)deviceDeltaX;
- (CGFloat)deviceDeltaY;
@end
// Enter fullscreen mode
//
@ -617,8 +622,16 @@ static int translateKey(unsigned int key)
else
#endif /*MAC_OS_X_VERSION_MAX_ALLOWED*/
{
deltaX = [event deltaX];
deltaY = [event deltaY];
if ([event _continuousScroll])
{
deltaX = [event deviceDeltaX] * 0.1;
deltaY = [event deviceDeltaY] * 0.1;
}
else
{
deltaX = [event deltaX];
deltaY = [event deltaY];
}
}
if (fabs(deltaX) > 0.0 || fabs(deltaY) > 0.0)