Fixed bug 1165 (SDL_GetMouseState() returns wrong location after swit…

…ch to/from fullscreen) I'm solving this by moving the mouse to the correct location after a fullscreen mode switch.
libsdl-org · Mar 12, 2011 · 2cb4972 · 2cb4972
1 parent 600a0fe
commit 2cb4972
Showing 1 changed file with 16 additions and 0 deletions.
diff --git a/src/video/SDL_video.c b/src/video/SDL_video.c
@@ -1017,6 +1017,17 @@ SDL_GetWindowPixelFormat(SDL_Window * window)
     return display->current_mode.format;
 }
 
+static void
+SDL_RestoreMousePosition(SDL_Window *window)
+{
+    int x, y;
+
+    if (window == SDL_GetMouseFocus()) {
+        SDL_GetMouseState(&x, &y);
+        SDL_WarpMouseInWindow(window, x, y);
+    }
+}
+
 static void
 SDL_UpdateFullscreenMode(SDL_Window * window, SDL_bool fullscreen)
 {
@@ -1070,6 +1081,8 @@ SDL_UpdateFullscreenMode(SDL_Window * window, SDL_bool fullscreen)
                 } else {
                     SDL_OnWindowResized(other);
                 }
+
+                SDL_RestoreMousePosition(other);
                 return;
             }
         }
@@ -1085,6 +1098,9 @@ SDL_UpdateFullscreenMode(SDL_Window * window, SDL_bool fullscreen)
 
     /* Generate a mode change event here */
     SDL_OnWindowResized(window);
+
+    /* Restore the cursor position */
+    SDL_RestoreMousePosition(window);
 }
 
 #define CREATE_FLAGS \