From 035187b63749d21572a60994288ed983ce5d68cc Mon Sep 17 00:00:00 2001 From: Sasha Szpakowski Date: Sun, 1 Mar 2026 00:20:32 -0400 Subject: [PATCH] window: fix setMode using stale minimum size information when applying the size. fixes #2287 --- src/modules/window/sdl/Window.cpp | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/modules/window/sdl/Window.cpp b/src/modules/window/sdl/Window.cpp index 6343d61f5..227e0a609 100644 --- a/src/modules/window/sdl/Window.cpp +++ b/src/modules/window/sdl/Window.cpp @@ -576,6 +576,8 @@ bool Window::setWindow(int width, int height, WindowSettings *settings) if (isOpen()) { + SDL_SetWindowMinimumSize(window, f.minwidth, f.minheight); + if (fsmode.w > 0 && fsmode.h > 0) SDL_SetWindowFullscreenMode(window, &fsmode); else @@ -620,6 +622,8 @@ bool Window::setWindow(int width, int height, WindowSettings *settings) if (!createWindowAndContext(x, y, width, height, createflags, renderer)) return false; + SDL_SetWindowMinimumSize(window, f.minwidth, f.minheight); + if (f.fullscreen) { if (fsmode.w > 0 && fsmode.h > 0) @@ -640,9 +644,6 @@ bool Window::setWindow(int width, int height, WindowSettings *settings) // Make sure the mouse keeps its previous grab setting. setMouseGrab(mouseGrabbed); - // Enforce minimum window dimensions. - SDL_SetWindowMinimumSize(window, f.minwidth, f.minheight); - if (this->settings.displayindex != f.displayindex || f.useposition || f.centered) SDL_SetWindowPosition(window, x, y);