From b08b536f200738ef4707cd61c399be224da930c1 Mon Sep 17 00:00:00 2001 From: Dyami Caliri Date: Wed, 17 Sep 2014 17:33:22 -0700 Subject: [PATCH] Windows qpa: fix minimum allowed fixed height, width on windows MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit A window width constraint coded in Qt4.8 was accidentally applied to the height in Qt5. Upon further review, it does not seem that this constraint is needed, in any case. Different versions of Windows have different minimum window widths (8.1 had 124px instead of 112), and setting a smaller value seems to cause no harm. Task-number: QTBUG-32820 Change-Id: I21ad6d406abf7344aff54d32b41974265aa9ea81 Reviewed-by: Jan Arve Sæther --- src/plugins/platforms/windows/qwindowswindow.cpp | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/plugins/platforms/windows/qwindowswindow.cpp b/src/plugins/platforms/windows/qwindowswindow.cpp index a61d1524c4..f6b1eefc13 100644 --- a/src/plugins/platforms/windows/qwindowswindow.cpp +++ b/src/plugins/platforms/windows/qwindowswindow.cpp @@ -770,9 +770,8 @@ void QWindowsGeometryHint::applyToMinMaxInfo(DWORD style, DWORD exStyle, MINMAXI const int maximumHeight = qMax(maximumSize.height(), minimumSize.height()); if (maximumWidth < QWINDOWSIZE_MAX) mmi->ptMaxTrackSize.x = maximumWidth + frameWidth; - // windows with title bar have an implicit size limit of 112 pixels if (maximumHeight < QWINDOWSIZE_MAX) - mmi->ptMaxTrackSize.y = qMax(maximumHeight + frameHeight, 112); + mmi->ptMaxTrackSize.y = maximumHeight + frameHeight; qCDebug(lcQpaWindows).nospace() << '<' << __FUNCTION__ << " frame=" << margins << ' ' << frameWidth << ',' << frameHeight << " out " << *mmi;