Commit 80916e01f3f77d0bfa6302ddbafbfeea5ec02805

Ryan C. Gordon 2015-05-26T11:38:04

Cocoa: Fixed relative mouse mode when app loses/regains focus (thanks, Eric!). Fixes Bugzilla #2718.

diff --git a/src/video/cocoa/SDL_cocoawindow.m b/src/video/cocoa/SDL_cocoawindow.m
index 2a02041..fb23f3c 100644
--- a/src/video/cocoa/SDL_cocoawindow.m
+++ b/src/video/cocoa/SDL_cocoawindow.m
@@ -531,13 +531,15 @@ SetWindowStyle(SDL_Window * window, unsigned int style)
 {
     SDL_Window *window = _data->window;
     SDL_Mouse *mouse = SDL_GetMouse();
-    if (mouse->relative_mode && !mouse->relative_mode_warp && ![self isMoving]) {
-        mouse->SetRelativeMouseMode(SDL_TRUE);
-    }
 
     /* We're going to get keyboard events, since we're key. */
+    /* This needs to be done before restoring the relative mouse mode. */
     SDL_SetKeyboardFocus(window);
 
+    if (mouse->relative_mode && !mouse->relative_mode_warp && ![self isMoving]) {
+        mouse->SetRelativeMouseMode(SDL_TRUE);
+    }
+
     /* If we just gained focus we need the updated mouse position */
     if (!mouse->relative_mode) {
         NSPoint point;