QQuickGridView: Respect margins

The margin has to be taken into account when calculating the positions
for the dimension we are not scrolling and when calculating the number
of columns available.

Fixes: QTBUG-69863
Change-Id: Id2a53ced263c8926a8bfaf658376be293af3e8c9
Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@qt.io>

1 files changed, 17 insertions, 0 deletions

diff --git a/tests/auto/quick/qquickgridview/tst_qquickgridview.cpp b/tests/auto/quick/qquickgridview/tst_qquickgridview.cpp
index 7deed8c5a8..301ec43cb5 100644
--- a/tests/auto/quick/qquickgridview/tst_qquickgridview.cpp
+++ b/tests/auto/quick/qquickgridview/tst_qquickgridview.cpp
@@ -4248,6 +4248,23 @@ void tst_QQuickGridView::margins()
 
         delete window;
     }
+    {
+        QQuickView *window = createView();
+
+        window->setSource(testFileUrl("margins2.qml"));
+        window->show();
+        qApp->processEvents();
+
+        QQuickGridView *gridview = findItem<QQuickGridView>(window->rootObject(), "grid");
+        QVERIFY(gridview != nullptr);
+        QQuickItem *contentItem = gridview->contentItem();
+        QVERIFY(contentItem != nullptr);
+        QTRY_COMPARE(QQuickItemPrivate::get(gridview)->polishScheduled, false);
+        QCOMPARE(contentItem->x(), 200);
+        QCOMPARE(contentItem->y(), 20);
+
+        delete window;
+    }
 }
 
 void tst_QQuickGridView::creationContext()