Fixed bug 1105 (SDL_GetMouseState returns wrong location upon window …

…re-activation)
libsdl-org · Feb 21, 2011 · 9ca9183 · 9ca9183
1 parent 5e5bac6
commit 9ca9183
Showing 1 changed file with 13 additions and 1 deletion.
diff --git a/src/video/cocoa/SDL_cocoawindow.m b/src/video/cocoa/SDL_cocoawindow.m
@@ -135,8 +135,20 @@ - (void)windowDidDeminiaturize:(NSNotification *)aNotification
 
 - (void)windowDidBecomeKey:(NSNotification *)aNotification
 {
+    SDL_Window *window = _data->window;
+
     /* We're going to get keyboard events, since we're key. */
-    SDL_SetKeyboardFocus(_data->window);
+    SDL_SetKeyboardFocus(window);
+
+    /* If we just gained focus we need the updated mouse position */
+    if (!(window->flags & SDL_WINDOW_FULLSCREEN)) {
+        NSPoint point;
+        point = [NSEvent mouseLocation];
+        point = [_data->nswindow convertScreenToBase:point];
+        point = [[_data->nswindow contentView] convertPoint:point fromView:nil];
+        point.y = window->h - point.y;
+        SDL_SendMouseMotion(window, 0, (int)point.x, (int)point.y);
+    }
 
     /* Check to see if someone updated the clipboard */
     Cocoa_CheckClipboardUpdate(_data->videodata);