diff --git a/src/plugins/platforms/wasm/qwasmwindow.cpp b/src/plugins/platforms/wasm/qwasmwindow.cpp index f9861bb4dba..b8197c5113c 100644 --- a/src/plugins/platforms/wasm/qwasmwindow.cpp +++ b/src/plugins/platforms/wasm/qwasmwindow.cpp @@ -208,23 +208,9 @@ bool QWasmWindow::onNonClientEvent(const PointerEvent &event) void QWasmWindow::initialize() { - QRect rect = windowGeometry(); - - const auto windowFlags = window()->flags(); - const bool shouldRestrictMinSize = - !windowFlags.testFlag(Qt::FramelessWindowHint) && !windowIsPopupType(windowFlags); - const bool isMinSizeUninitialized = window()->minimumSize() == QSize(0, 0); - - if (shouldRestrictMinSize && isMinSizeUninitialized) - window()->setMinimumSize(QSize(minSizeForRegularWindows, minSizeForRegularWindows)); - - - const QSize minimumSize = windowMinimumSize(); - 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.height(), targetSize.height(), maximumSize.height())); + auto initialGeometry = QPlatformWindow::initialGeometry(window(), + windowGeometry(), defaultWindowSize, defaultWindowSize); + m_normalGeometry = initialGeometry; setWindowState(window()->windowStates()); setWindowFlags(window()->flags()); @@ -233,7 +219,6 @@ void QWasmWindow::initialize() if (window()->isTopLevel()) setWindowIcon(window()->icon()); - m_normalGeometry = rect; QPlatformWindow::setGeometry(m_normalGeometry); #if QT_CONFIG(accessibility) diff --git a/src/plugins/platforms/wasm/qwasmwindow.h b/src/plugins/platforms/wasm/qwasmwindow.h index 2c4c0d3df36..ab0dc68e839 100644 --- a/src/plugins/platforms/wasm/qwasmwindow.h +++ b/src/plugins/platforms/wasm/qwasmwindow.h @@ -105,7 +105,7 @@ public: private: friend class QWasmScreen; - static constexpr auto minSizeForRegularWindows = 100; + static constexpr auto defaultWindowSize = 160; // QWasmWindowTreeNode: QWasmWindow *asWasmWindow() final; diff --git a/tests/auto/wasm/selenium/qwasmwindow.py b/tests/auto/wasm/selenium/qwasmwindow.py index 69934b1db51..39147b7a0f9 100644 --- a/tests/auto/wasm/selenium/qwasmwindow.py +++ b/tests/auto/wasm/selenium/qwasmwindow.py @@ -28,7 +28,6 @@ class WidgetTestCase(unittest.TestCase): self.addTypeEqualityFunc(Rect, assert_rects_equal) def test_window_resizing(self): - defaultWindowMinSize = 100 screen = Screen(self._driver, ScreenPosition.FIXED, x=0, y=0, width=600, height=600) window = Window(parent=screen, rect=Rect(x=100, y=100, width=200, height=200)) @@ -59,7 +58,7 @@ class WidgetTestCase(unittest.TestCase): self.assertEqual(window.rect, Rect(x=75, y=95, width=215, height=230)) window.drag(Handle.BOTTOM_RIGHT, direction=UP(150) + LEFT(150)) - self.assertEqual(window.rect, Rect(x=75, y=95, width=defaultWindowMinSize, height=defaultWindowMinSize)) + self.assertEqual(window.rect, Rect(x=75, y=95, width=65, height=80)) def test_cannot_resize_over_screen_top_edge(self): screen = Screen(self._driver, ScreenPosition.FIXED,