Date: Mon, 25 Oct 2004 17:30:06 +0200

From: Gautier Portet
Subject: [SDL] Re: Centering a window

Hi, here is a patch fixing the win32 centered window bug

--HG--
extra : convert_revision : svn%3Ac70aab31-4412-0410-b14c-859654838e24/trunk%40972

src/video/windib/SDL_dibvideo.c

@@ -703,12 +703,12 @@ SDL_Surface *DIB_SetVideoMode(_THIS, SDL_Surface *current,
 		if ( (flags & SDL_FULLSCREEN) ) {
 			x = (GetSystemMetrics(SM_CXSCREEN)-width)/2;
 			y = (GetSystemMetrics(SM_CYSCREEN)-height)/2;
-		} else if ( SDL_windowX || SDL_windowY || window ) {
-			x = bounds.left;
-			y = bounds.top;
 		} else if ( center ) {
 			x = (GetSystemMetrics(SM_CXSCREEN)-width)/2;
 			y = (GetSystemMetrics(SM_CYSCREEN)-height)/2;
+		} else if ( SDL_windowX || SDL_windowY || window ) {
+			x = bounds.left;
+			y = bounds.top;
 		} else {
 			x = y = -1;
 			swp_flags |= SWP_NOMOVE;

src/video/windx5/SDL_dx5video.c

@@ -1168,12 +1168,12 @@ SDL_Surface *DX5_SetVideoMode(_THIS, SDL_Surface *current,
 			if ( (flags & SDL_FULLSCREEN) ) {
 				x = (GetSystemMetrics(SM_CXSCREEN)-width)/2;
 				y = (GetSystemMetrics(SM_CYSCREEN)-height)/2;
-			} else if ( SDL_windowX || SDL_windowY || window ) {
-				x = bounds.left;
-				y = bounds.top;
 			} else if ( center ) {
 				x = (GetSystemMetrics(SM_CXSCREEN)-width)/2;
 				y = (GetSystemMetrics(SM_CYSCREEN)-height)/2;
+			} else if ( SDL_windowX || SDL_windowY || window ) {
+				x = bounds.left;
+				y = bounds.top;
 			} else {
 				x = y = -1;
 				swp_flags |= SWP_NOMOVE;
@@ -1574,12 +1574,12 @@ SDL_Surface *DX5_SetVideoMode(_THIS, SDL_Surface *current,
 		if ( (flags & SDL_FULLSCREEN) ) {
 			x = (GetSystemMetrics(SM_CXSCREEN)-width)/2;
 			y = (GetSystemMetrics(SM_CYSCREEN)-height)/2;
-		} else if ( SDL_windowX || SDL_windowY || window ) {
-			x = bounds.left;
-			y = bounds.top;
 		} else if ( center ) {
 			x = (GetSystemMetrics(SM_CXSCREEN)-width)/2;
 			y = (GetSystemMetrics(SM_CYSCREEN)-height)/2;
+		} else if ( SDL_windowX || SDL_windowY || window ) {
+			x = bounds.left;
+			y = bounds.top;
 		} else {
 			x = y = -1;
 			swp_flags |= SWP_NOMOVE;