From 45d52f4473e8b7d57f570badb7d9409d2bc88592 Mon Sep 17 00:00:00 2001 From: CANTENOT Thierry Date: Sun, 9 Jun 2024 09:49:02 +0200 Subject: [PATCH] Splits min|max width and height limits for Win32 window Currently, we cannot constraint the window size for only a single direction (width or height): we can either not constraint at all or constraint both width and height. With this change, the size constraints can be specified for a single direction as well. --- src/win32_window.c | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/src/win32_window.c b/src/win32_window.c index d014944b..e822378b 100644 --- a/src/win32_window.c +++ b/src/win32_window.c @@ -1107,17 +1107,23 @@ static LRESULT CALLBACK windowProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM l else AdjustWindowRectEx(&frame, style, FALSE, exStyle); - if (window->minwidth != GLFW_DONT_CARE && - window->minheight != GLFW_DONT_CARE) + if (window->minwidth != GLFW_DONT_CARE) { mmi->ptMinTrackSize.x = window->minwidth + frame.right - frame.left; + } + + if (window->minheight != GLFW_DONT_CARE) + { mmi->ptMinTrackSize.y = window->minheight + frame.bottom - frame.top; } - if (window->maxwidth != GLFW_DONT_CARE && - window->maxheight != GLFW_DONT_CARE) + if (window->maxwidth != GLFW_DONT_CARE) { mmi->ptMaxTrackSize.x = window->maxwidth + frame.right - frame.left; + } + + if (window->maxheight != GLFW_DONT_CARE) + { mmi->ptMaxTrackSize.y = window->maxheight + frame.bottom - frame.top; }