Move window-size bounding into the texture and GL blocks

kcgen · kcgen · commit d9ac21705db7 · 2023-04-06T11:09:47.000-07:00
diff --git a/src/gui/sdlmain.cpp b/src/gui/sdlmain.cpp
@@ -1955,6 +1955,13 @@ Bitu GFX_SetSize(int width,
 			retFlags |= GFX_CAN_RANDOM;
 		}
 
+		// Re-apply the minimum bounds prior to clipping the
+		// texture-based window because SDL invalidates the prior bounds
+		// in the above changes.
+		SDL_SetWindowMinimumSize(sdl.window,
+		                         FALLBACK_WINDOW_DIMENSIONS.x,
+		                         FALLBACK_WINDOW_DIMENSIONS.y);
+
 		// One-time intialize the window size
 		if (!sdl.desktop.window.adjusted_initial_size) {
 			initialize_sdl_window_size(sdl.window,
@@ -2024,6 +2031,13 @@ Bitu GFX_SetSize(int width,
 			        SDL_GetError());
 		}
 
+		// Re-apply the minimum bounds prior to clipping the OpenGL
+		// window because SDL invalidates the prior bounds in the above
+		// window changes.
+		SDL_SetWindowMinimumSize(sdl.window,
+		                         FALLBACK_WINDOW_DIMENSIONS.x,
+		                         FALLBACK_WINDOW_DIMENSIONS.y);
+
 		SetupWindowScaled(SCREEN_OPENGL, sdl.desktop.want_resizable_window);
 
 		/* We may simply use SDL_BYTESPERPIXEL
@@ -2270,14 +2284,6 @@ Bitu GFX_SetSize(int width,
 	}
 #endif // C_OPENGL
 	}
-
-	// Always re-apply the minimum size to the updated window instead of
-	// checking GetWindowMinumSize, as SDL invalidates the prior set
-	// minimums when switching from fullscreen back to windowed.
-	SDL_SetWindowMinimumSize(sdl.window,
-	                         FALLBACK_WINDOW_DIMENSIONS.x,
-	                         FALLBACK_WINDOW_DIMENSIONS.y);
-
 	// Ensure mouse emulation knows the current parameters
 	NewMouseScreenParams();
 	update_vsync_state();
