gwm17/glfw
1
0
Fork 0
mirror of https://github.com/gwm17/glfw.git synced 2024-11-30 05:58:52 -05:00
Code Issues Projects Releases Wiki Activity

Updated Cocoa port to new internal API.

Browse Source
This commit is contained in:
Camilla Berglund 2010-09-28 02:30:05 +02:00
parent c4bd93ecdf
commit 35b8ee6a71
2 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/cocoa/cocoa_window.m
View File

@ -109,15 +109,12 @@
- (void)windowDidBecomeKey:(NSNotification *)notification - (void)windowDidBecomeKey:(NSNotification *)notification
{ {
_glfwLibrary.activeWindow = window; _glfwInputWindowFocus(window, GL_TRUE);
} }
- (void)windowDidResignKey:(NSNotification *)notification - (void)windowDidResignKey:(NSNotification *)notification
{ {
if (window == _glfwLibrary.activeWindow) _glfwInputWindowFocus(window, GL_FALSE);
_glfwLibrary.activeWindow = NULL;
_glfwInputDeactivation(window);
} }
@end @end
@ -449,11 +446,14 @@ static int convertMacKeyCode(unsigned int macKeyCode)
- (void)scrollWheel:(NSEvent *)event - (void)scrollWheel:(NSEvent *)event
{ {
window->NS.wheelPosFloating += [event deltaY]; double deltaX = window->NS.fracScrollX + [event deltaX];
window->wheelPos = lrint(window->NS.wheelPosFloating); double deltaY = window->NS.fracScrollY + [event deltaY];
if (window->mouseWheelCallback) if ((int) deltaX || (int) deltaY)
window->mouseWheelCallback(window, window->wheelPos); _glfwInputScroll(window, (int) deltaX, (int) deltaY);
window->NS.fracScrollX = (int) (deltaX - floor(deltaX));
window->NS.fracScrollY = (int) (deltaY - floor(deltaY));
} }
@end @end

3
src/cocoa/platform.h
View File

@ -85,7 +85,8 @@ typedef struct _GLFWwindowNS
id window; id window;
id delegate; id delegate;
unsigned int modifierFlags; unsigned int modifierFlags;
double wheelPosFloating; double fracScrollX;
double fracScrollY;
} _GLFWwindowNS; } _GLFWwindowNS;