Mac: Don't disassociate cursor if window is moving / doesn't have focus.

Bug: https://bugzilla.libsdl.org/show_bug.cgi?id=2396
libsdl-org · Feb 27, 2014 · dd94c5f · dd94c5f
1 parent 4850d25
commit dd94c5f
Showing 1 changed file with 16 additions and 1 deletion.
diff --git a/src/video/cocoa/SDL_cocoamouse.m b/src/video/cocoa/SDL_cocoamouse.m
@@ -244,8 +244,23 @@ + (NSCursor *)invisibleCursor
 static int
 Cocoa_SetRelativeMouseMode(SDL_bool enabled)
 {
-    CGError result;
+    /* We will re-apply the relative mode when the window gets focus, if it
+     * doesn't have focus right now.
+     */
+    SDL_Window *window = SDL_GetMouseFocus();
+    if (!window) {
+      return 0;
+    }
 
+    /* We will re-apply the relative mode when the window finishes being moved,
+     * if it is being moved right now.
+     */
+    SDL_WindowData *data = (SDL_WindowData *) window->driverdata;
+    if ([data->listener isMoving]) {
+        return;
+    }
+
+    CGError result;
     if (enabled) {
         DLog("Turning on.");
         result = CGAssociateMouseAndMouseCursorPosition(NO);