gwm17/glfw
1
0
Fork 0
mirror of https://github.com/gwm17/glfw.git synced 2024-11-23 10:48:51 -05:00
Code Issues Projects Releases Wiki Activity

Merge pull request #95 from shurcooL/master

Browse Source 
Added support for Cocoa precise scrolling deltas.
This commit is contained in:
Camilla Berglund 2013-07-21 14:08:50 -07:00
parent 7e8c7843c5 5655e26315
commit 53cf4a3b4d
2 changed files with 23 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
README.md
View File

@ -112,6 +112,7 @@ See the [GLFW documentation](http://www.glfw.org/docs/latest/).
returned by `glfwGetProcAddress` returned by `glfwGetProcAddress`
- [Win32] Bugfix: The user32 and dwmapi module handles were not freed on - [Win32] Bugfix: The user32 and dwmapi module handles were not freed on
library termination library termination
- [Cocoa] Changed scroll callback to use precise scrolling deltas when available
- [Cocoa] Enabled explicit creation of OpenGL 3.x and 4.x contexts as supported - [Cocoa] Enabled explicit creation of OpenGL 3.x and 4.x contexts as supported
by OS X 10.9 by OS X 10.9
- [Cocoa] Bugfix: The clipboard string was not freed on terminate - [Cocoa] Bugfix: The clipboard string was not freed on terminate

25
src/cocoa_window.m
View File

@ -560,7 +560,7 @@ static int translateKey(unsigned int key)
userInfo:nil]; userInfo:nil];
[self addTrackingArea:trackingArea]; [self addTrackingArea:trackingArea];
[super updateTrackingAreas]; [super updateTrackingAreas];
} }
- (void)keyDown:(NSEvent *)event - (void)keyDown:(NSEvent *)event
@ -606,8 +606,27 @@ static int translateKey(unsigned int key)
- (void)scrollWheel:(NSEvent *)event - (void)scrollWheel:(NSEvent *)event
{ {
double deltaX = [event deltaX]; double deltaX, deltaY;
double deltaY = [event deltaY];
#if MAC_OS_X_VERSION_MAX_ALLOWED >= 1070
if ([event respondsToSelector:@selector(hasPreciseScrollingDeltas:)])
{
deltaX = [event scrollingDeltaX];
deltaY = [event scrollingDeltaY];
if ([event hasPreciseScrollingDeltas])
{
deltaX *= 0.1;
deltaY *= 0.1;
}
}
else
#else
{
deltaX = [event deltaX];
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);