SDL_SetWindowPosition respects display num for SDL_WINDOWPOS_CENTERED_DISPLAY.
authorEdward Rudd <urkle@outoforder.cc>
Thu, 19 Feb 2015 19:40:58 -0500
changeset 9363 c9a4d606f6db
parent 9362 dfd8202eb9a7
child 9364 ad9d35983de5
SDL_SetWindowPosition respects display num for SDL_WINDOWPOS_CENTERED_DISPLAY. This allows for this kind of code in an application: int monitorID = 1; // the second monitor! SDL_SetWindowPosition(sdlWin, SDL_WINDOWPOS_CENTERED_DISPLAY(monitorID), SDL_WINDOWPOS_CENTERED_DISPLAY(monitorID)); Fixes Bugzilla #2849.
src/video/SDL_video.c
--- a/src/video/SDL_video.c	Sat Jan 10 13:47:37 2015 +0100
+++ b/src/video/SDL_video.c	Thu Feb 19 19:40:58 2015 -0500
@@ -1607,13 +1607,14 @@
     CHECK_WINDOW_MAGIC(window,);
 
     if (SDL_WINDOWPOS_ISCENTERED(x) || SDL_WINDOWPOS_ISCENTERED(y)) {
-        SDL_VideoDisplay *display = SDL_GetDisplayForWindow(window);
-        int displayIndex;
+        int displayIndex = (x & 0xFFFF);
         SDL_Rect bounds;
+        if (displayIndex > _this->num_displays) {
+            displayIndex = 0;
+        }
 
         SDL_zero(bounds);
 
-        displayIndex = SDL_GetIndexOfDisplay(display);
         SDL_GetDisplayBounds(displayIndex, &bounds);
         if (SDL_WINDOWPOS_ISCENTERED(x)) {
             x = bounds.x + (bounds.w - window->w) / 2;