Cleanup of OS X cursor fixes.

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

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
bit field was unchanged
- [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] Bugfix: Failure to load winmm or its functions was not reported to
the error callback

View File

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