[Scummvm-git-logs] scummvm master -> 55dccdf78738857368d81716a9167fa77b3c746b

criezy noreply at scummvm.org
Sun Jun 5 16:22:27 UTC 2022


This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
55dccdf787 SDL: Do not adjust window size when creating maximized window


Commit: 55dccdf78738857368d81716a9167fa77b3c746b
    https://github.com/scummvm/scummvm/commit/55dccdf78738857368d81716a9167fa77b3c746b
Author: Thierry Crozat (criezy at scummvm.org)
Date: 2022-06-05T17:21:18+01:00

Commit Message:
SDL: Do not adjust window size when creating maximized window

Changed paths:
    backends/graphics/sdl/sdl-graphics.cpp


diff --git a/backends/graphics/sdl/sdl-graphics.cpp b/backends/graphics/sdl/sdl-graphics.cpp
index ec8ea78dbb1..92c925ee301 100644
--- a/backends/graphics/sdl/sdl-graphics.cpp
+++ b/backends/graphics/sdl/sdl-graphics.cpp
@@ -297,7 +297,8 @@ bool SdlGraphicsManager::createOrUpdateWindow(int width, int height, const Uint3
 	// may change the scaler, which should reset the window size)
 	if (!_window->getSDLWindow() || _lastFlags != flags || _overlayVisible || _allowWindowSizeReset) {
 		const bool fullscreen = (flags & (SDL_WINDOW_FULLSCREEN | SDL_WINDOW_FULLSCREEN_DESKTOP)) != 0;
-		if (!fullscreen) {
+		const bool maximized = (flags & SDL_WINDOW_MAXIMIZED);
+		if (!fullscreen && !maximized) {
 			if (_hintedWidth) {
 				width = _hintedWidth;
 			}




More information about the Scummvm-git-logs mailing list