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

Fixed changing cursor while it's outside window.

Browse Source 
We need to invoke both [NSCursor set] and [NSView addCursorRect].

First call is responsible for changing the cursor if it's inside the
view; second call is responsible for keeping the cursor the same if it's
outside.
This commit is contained in:
Arseny Kapoulkine 2014-07-30 19:57:43 -07:00 committed by Camilla Berglund
parent e74ebf0be3
commit 87fb437d76
1 changed files with 27 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
src/cocoa_window.m
View File

@ -39,19 +39,31 @@ static void centerCursor(_GLFWwindow *window)
_glfwPlatformSetCursorPos(window, width / 2.0, height / 2.0); _glfwPlatformSetCursorPos(window, width / 2.0, height / 2.0);
} }
// Update the cursor to match the specified cursor mode // Get the cursor object that window uses in the specified cursor mode
// //
static void setModeCursor(_GLFWwindow* window) static NSCursor* getModeCursor(_GLFWwindow* window)
{ {
if (window->cursorMode == GLFW_CURSOR_NORMAL) if (window->cursorMode == GLFW_CURSOR_NORMAL)
{ {
if (window->cursor) if (window->cursor)
[(NSCursor*) window->cursor->ns.object set]; return (NSCursor*) window->cursor->ns.object;
else else
[[NSCursor arrowCursor] set]; return [NSCursor arrowCursor];
} }
else else
[(NSCursor*) _glfw.ns.cursor set]; return (NSCursor*) _glfw.ns.cursor;
}
// Update the cursor to match the specified cursor mode
//
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 cursor is outside the window
[window->ns.object invalidateCursorRectsForView:window->ns.view];
} }
// Enter fullscreen mode // Enter fullscreen mode
@ -478,7 +490,7 @@ static int translateKey(unsigned int key)
- (void)cursorUpdate:(NSEvent *)event - (void)cursorUpdate:(NSEvent *)event
{ {
setModeCursor(window); updateModeCursor(window);
} }
- (void)mouseDown:(NSEvent *)event - (void)mouseDown:(NSEvent *)event
@ -673,6 +685,13 @@ static int translateKey(unsigned int key)
_glfwInputScroll(window, deltaX, deltaY); _glfwInputScroll(window, deltaX, deltaY);
} }
- (void)resetCursorRects
{
NSCursor* cursor = getModeCursor(window);
[self addCursorRect:[self bounds] cursor:cursor];
}
- (NSDragOperation)draggingEntered:(id <NSDraggingInfo>)sender - (NSDragOperation)draggingEntered:(id <NSDraggingInfo>)sender
{ {
if ((NSDragOperationGeneric & [sender draggingSourceOperationMask]) if ((NSDragOperationGeneric & [sender draggingSourceOperationMask])
@ -1191,7 +1210,7 @@ void _glfwPlatformPostEmptyEvent(void)
void _glfwPlatformSetCursorPos(_GLFWwindow* window, double x, double y) void _glfwPlatformSetCursorPos(_GLFWwindow* window, double x, double y)
{ {
setModeCursor(window); updateModeCursor(window);
if (window->monitor) if (window->monitor)
{ {
@ -1211,7 +1230,7 @@ void _glfwPlatformSetCursorPos(_GLFWwindow* window, double x, double y)
void _glfwPlatformApplyCursorMode(_GLFWwindow* window) void _glfwPlatformApplyCursorMode(_GLFWwindow* window)
{ {
setModeCursor(window); updateModeCursor(window);
if (window->cursorMode == GLFW_CURSOR_DISABLED) if (window->cursorMode == GLFW_CURSOR_DISABLED)
{ {