mirror/glfw
1
0
Fork 0
mirror of https://github.com/glfw/glfw.git synced 2024-11-22 13:04:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Cleanup of OS X cursor fixes.

Browse Source 
Closes #334.
Fixes #254.
This commit is contained in:
Camilla Berglund 2014-08-13 09:15:48 +02:00
parent 87fb437d76
commit 8cd88ddf61
2 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
README.md
View File

@ -82,6 +82,7 @@ GLFW bundles a number of dependencies in the `deps/` directory.
- [Cocoa] Bugfix: Modifier key events were lost if the corresponding modifier - [Cocoa] Bugfix: Modifier key events were lost if the corresponding modifier
bit field was unchanged bit field was unchanged
- [Cocoa] Bugfix: Joystick enumeration took hundreds of ms on some systems - [Cocoa] Bugfix: Joystick enumeration took hundreds of ms on some systems
- [Cocoa] Bugfix: The cursor was hidden when the user resized a GLFW window
- [Win32] Enabled generation of pkg-config file for MinGW - [Win32] Enabled generation of pkg-config file for MinGW
- [Win32] Bugfix: Failure to load winmm or its functions was not reported to - [Win32] Bugfix: Failure to load winmm or its functions was not reported to
the error callback the error callback

11
src/cocoa_window.m
View File

@ -58,11 +58,10 @@ static NSCursor* getModeCursor(_GLFWwindow* window)
// //
static void updateModeCursor(_GLFWwindow* window) static void updateModeCursor(_GLFWwindow* window)
{ {
// This is required for the cursor to update if cursor is inside the window // This is required for the cursor to update if it's inside the window
NSCursor* cursor = getModeCursor(window); [getModeCursor(window) set];
[cursor set];
// This is required for the cursor to update if cursor is outside the window // This is required for the cursor to update if it's outside the window
[window->ns.object invalidateCursorRectsForView:window->ns.view]; [window->ns.object invalidateCursorRectsForView:window->ns.view];
} }
@ -687,9 +686,7 @@ static int translateKey(unsigned int key)
- (void)resetCursorRects - (void)resetCursorRects
{ {
NSCursor* cursor = getModeCursor(window); [self addCursorRect:[self bounds] cursor:getModeCursor(window)];
[self addCursorRect:[self bounds] cursor:cursor];
} }
- (NSDragOperation)draggingEntered:(id <NSDraggingInfo>)sender - (NSDragOperation)draggingEntered:(id <NSDraggingInfo>)sender