Avoid unnecessary SDL window-size set calls

kcgen · kcgen · commit 16c50930447a · 2023-04-02T22:05:19.000-07:00
This avoids making SDL set the window size
when in fullscreen mode (and adds an assert
to make sure of that).

Previously on macOS, up to three extra
set-window-size callbacks could happen when
switching from fullscreen.
diff --git a/src/gui/sdlmain.cpp b/src/gui/sdlmain.cpp
@@ -806,6 +806,8 @@ static SDL_Point get_initial_window_position_or_default(int default_val)
 // firing before the window is resized in which case an endless loop can occur
 static void safe_set_window_size(const int w, const int h)
 {
+	assert(sdl.desktop.fullscreen == false);
+
 	decltype(sdl.draw.callback) saved_callback = nullptr;
 	// Swap and save the callback with a a no-op
 	std::swap(sdl.draw.callback, saved_callback);
@@ -1884,6 +1886,7 @@ Bitu GFX_SetSize(int width,
 		// Adjust the window size if needed and permitted
 		if (sdl.scaling_mode != SCALING_MODE::PERFECT &&
 		    window_doesnt_match_desired && desired_size_is_valid &&
+		    !sdl.desktop.fullscreen &&
 		    !sdl.desktop.window.adjusted_initial_size) {
 			sdl.desktop.window.adjusted_initial_size = true;
 			safe_set_window_size(desired_w, desired_h);
@@ -2073,6 +2076,7 @@ Bitu GFX_SetSize(int width,
 		// Adjust the window size if needed and permitted
 		if (sdl.scaling_mode != SCALING_MODE::PERFECT &&
 		    window_doesnt_match_desired && desired_size_is_valid &&
+		    !sdl.desktop.fullscreen &&
 		    !sdl.desktop.window.adjusted_initial_size) {
 			sdl.desktop.window.adjusted_initial_size = true;
 			safe_set_window_size(desired_w, desired_h);
