Do not allow an empty rect to become a window rect on WASM

For regular windows, the size should not be allowed to be empty. This
emulates system-wide minimum size setting on various operating systems.

Change-Id: I515fff8c9bfd14762dcfe88fb923ab10d8edd5c1
Reviewed-by: Morten Johan Sørvig <morten.sorvig@qt.io>

1 files changed, 14 insertions, 9 deletions

diff --git a/src/plugins/platforms/wasm/qwasmwindow.cpp b/src/plugins/platforms/wasm/qwasmwindow.cpp
index 02298bb4a1..445f5ed809 100644
--- a/src/plugins/platforms/wasm/qwasmwindow.cpp
+++ b/src/plugins/platforms/wasm/qwasmwindow.cpp
@@ -109,15 +109,19 @@ void QWasmWindow::initialize()
 {
     QRect rect = windowGeometry();
 
-    QPlatformWindow::setGeometry(rect);
-
-    const QSize minimumSize = windowMinimumSize();
-    if (rect.width() > 0 || rect.height() > 0) {
-        rect.setWidth(qBound(1, rect.width(), 2000));
-        rect.setHeight(qBound(1, rect.height(), 2000));
-    } else if (minimumSize.width() > 0 || minimumSize.height() > 0) {
-        rect.setSize(minimumSize);
-    }
+    constexpr int minSizeBoundForDialogsAndRegularWindows = 100;
+    const int windowType = window()->flags() & Qt::WindowType_Mask;
+    const int systemMinSizeLowerBound = windowType == Qt::Window || windowType == Qt::Dialog
+            ? minSizeBoundForDialogsAndRegularWindows
+            : 0;
+
+    const QSize minimumSize(std::max(windowMinimumSize().width(), systemMinSizeLowerBound),
+                            std::max(windowMinimumSize().height(), systemMinSizeLowerBound));
+    const QSize maximumSize = windowMaximumSize();
+    const QSize targetSize = !rect.isEmpty() ? rect.size() : minimumSize;
+
+    rect.setWidth(qBound(minimumSize.width(), targetSize.width(), maximumSize.width()));
+    rect.setHeight(qBound(minimumSize.width(), targetSize.height(), maximumSize.height()));
 
     setWindowState(window()->windowStates());
     setWindowFlags(window()->flags());
@@ -125,6 +129,7 @@ void QWasmWindow::initialize()
     if (window()->isTopLevel())
         setWindowIcon(window()->icon());
     m_normalGeometry = rect;
+    QPlatformWindow::setGeometry(m_normalGeometry);
 }
 
 QWasmScreen *QWasmWindow::platformScreen() const