glswapbuffer consistency and create the window in the center (still, it doesn't work past sdl r5296)
authorkoda
Wed, 23 Mar 2011 16:27:24 +0100
changeset 5043 2df62e1a6c02
parent 5042 f26c5eb040af
child 5044 6e8da75e5f5e
child 5045 f215eb5d4b75
glswapbuffer consistency and create the window in the center (still, it doesn't work past sdl r5296)
hedgewars/uStore.pas
--- a/hedgewars/uStore.pas	Wed Mar 23 14:15:20 2011 +0100
+++ b/hedgewars/uStore.pas	Wed Mar 23 16:27:24 2011 +0100
@@ -687,9 +687,10 @@
 
     DrawFromRect( -squaresize div 2, (cScreenHeight - squaresize) shr 1, @r, ProgrTex);
 
-    SDL_GL_SwapBuffers();
 {$IFDEF SDL13}
     SDL_RenderPresent(SDLrender);
+{$ELSE}
+    SDL_GL_SwapBuffers();
 {$ENDIF}
     inc(Step);
 
@@ -925,9 +926,10 @@
 {$IFDEF SDL13}
     if SDLwindow = nil then
     begin
-        // on ipad, when second monitor is attached, display window in second monitor always
-        x:= {$IFDEF IPHONEOS}(SDL_WINDOWPOS_CENTERED_MASK or (SDL_GetNumVideoDisplays() - 1)){$ELSE}0{$ENDIF};
-        y:= {$IFDEF IPHONEOS}(SDL_WINDOWPOS_CENTERED_MASK or (SDL_GetNumVideoDisplays() - 1)){$ELSE}0{$ENDIF};
+        // the values in x and y make the window appear in the center
+        // on ios, make the sdl window appear on the second monitor when present
+        x:= (SDL_WINDOWPOS_CENTERED_MASK or {$IFDEF IPHONEOS}SDL_GetNumVideoDisplays() - 1){$ELSE}0{$ENDIF});
+        y:= (SDL_WINDOWPOS_CENTERED_MASK or {$IFDEF IPHONEOS}SDL_GetNumVideoDisplays() - 1){$ELSE}0{$ENDIF});
         SDLwindow:= SDL_CreateWindow('Hedgewars', x, y, cScreenWidth, cScreenHeight, SDL_WINDOW_OPENGL or SDL_WINDOW_SHOWN
                         {$IFDEF IPHONEOS} or SDL_WINDOW_BORDERLESS {$ENDIF});
         SDLrender:= SDL_CreateRenderer(SDLwindow, -1, SDL_RENDERER_ACCELERATED or SDL_RENDERER_PRESENTVSYNC);