1 files changed, 25 insertions, 0 deletions
diff --git a/tests/auto/client/xdgshell/tst_xdgshell.cpp b/tests/auto/client/xdgshell/tst_xdgshell.cpp
index e560784e9..efaa6a8f1 100644
--- a/tests/auto/client/xdgshell/tst_xdgshell.cpp
+++ b/tests/auto/client/xdgshell/tst_xdgshell.cpp
@@ -19,6 +19,7 @@ private slots:
     void basicConfigure();
     void configureSize();
     void configureStates();
+    void configureBounds();
     void popup();
     void tooltipOnPopup();
     void tooltipAndSiblingPopup();
@@ -170,6 +171,30 @@ void tst_xdgshell::configureStates()
     QVERIFY(qunsetenv("QT_WAYLAND_FRAME_CALLBACK_TIMEOUT"));
 }
 
+void tst_xdgshell::configureBounds()
+{
+    QRasterWindow window;
+    window.resize(1280, 1024);
+    window.show();
+    QCOMPOSITOR_TRY_VERIFY(xdgToplevel());
+
+    // Take xdg_toplevel.configure_bounds into account only if the configure event has 0x0 size.
+    const uint serial1 = exec([=] {
+        xdgToplevel()->sendConfigureBounds(QSize(800, 600));
+        return xdgToplevel()->sendCompleteConfigure(QSize(0, 0), { XdgToplevel::state_activated });
+    });
+    QCOMPOSITOR_TRY_COMPARE(xdgSurface()->m_committedConfigureSerial, serial1);
+    QCOMPARE(window.frameGeometry().size(), QSize(800, 600));
+
+    // Window size in xdg_toplevel configure events takes precedence over the configure bounds.
+    const uint serial2 = exec([=] {
+        xdgToplevel()->sendConfigureBounds(QSize(800, 600));
+        return xdgToplevel()->sendCompleteConfigure(QSize(1600, 900), { XdgToplevel::state_activated });
+    });
+    QCOMPOSITOR_TRY_COMPARE(xdgSurface()->m_committedConfigureSerial, serial2);
+    QCOMPARE(window.frameGeometry().size(), QSize(1600, 900));
+}
+
 void tst_xdgshell::popup()
 {
     class Window : public QRasterWindow {