Remove QtGraphicsListView::horizontalOffset and verticalOffset properties and replace by a single offset property.

Since the view is one-dimensional and has the orientation property, offset should be sufficient.

2 files changed, 68 insertions, 76 deletions

diff --git a/tests/qgraphicsflowview/tst_qgraphicsflowview.cpp b/tests/qgraphicsflowview/tst_qgraphicsflowview.cpp
index 284d0be..9bb3124 100644
--- a/tests/qgraphicsflowview/tst_qgraphicsflowview.cpp
+++ b/tests/qgraphicsflowview/tst_qgraphicsflowview.cpp
@@ -133,7 +133,7 @@ void tst_QListFlowLayout::itemAtVertical()
     QCOMPARE(view->itemAt(QPointF(165, 59)), 3);
     QCOMPARE(view->itemAt(QPointF(166, 59)), -1);
 
-    view->setHorizontalOffset(-10); // moves the items to the right
+    view->setOffset(-10); // moves the items to the right
     QCOMPARE(view->itemAt(QPointF(0, 0)), -1);
     QCOMPARE(view->itemAt(QPointF(10, 0)), 2);
     QCOMPARE(view->itemAt(QPointF(10, 66)), 4);
@@ -145,7 +145,7 @@ void tst_QListFlowLayout::itemAtVertical()
     QCOMPARE(view->itemAt(QPointF(176, 59)), -1);
 
     // vertical offset has an effect too
-    view->setVerticalOffset(21);
+    view->setOffset(21);
     int expectedYOffset = 21;
     QCOMPARE(view->itemAt(QPointF(0, 0)), -1);
     QCOMPARE(view->itemAt(QPointF(0, 20)), -1);
@@ -158,7 +158,7 @@ void tst_QListFlowLayout::itemAtVertical()
     QCOMPARE(view->itemAt(QPointF(175, 59-expectedYOffset)), 3);
     QCOMPARE(view->itemAt(QPointF(176, 59-expectedYOffset)), -1);
 
-    view->setVerticalOffset(-21);
+    view->setOffset(-21);
     expectedYOffset -= 21 * 2;
     // a negative offset means we move the items down in the view and thus some white space
     // appears above.  The view does not show any items that come before the firstIndex!
diff --git a/tests/qgraphicslistview/tst_qgraphicslistview.cpp b/tests/qgraphicslistview/tst_qgraphicslistview.cpp
index dfd4e23..4fa76aa 100644
--- a/tests/qgraphicslistview/tst_qgraphicslistview.cpp
+++ b/tests/qgraphicslistview/tst_qgraphicslistview.cpp
@@ -60,6 +60,8 @@ public slots:
 
 private slots:
     void getSetCheck();
+    void maximumOffset_data();
+    void maximumOffset();
     void maximumFirstIndex_data();
     void maximumFirstIndex();
     void itemGeometry_data();
@@ -104,31 +106,22 @@ void tst_QtGraphicsListView::cleanup()
 
 void tst_QtGraphicsListView::getSetCheck()
 {
-    QCOMPARE(view->horizontalOffset(), 0.); // default
+    QCOMPARE(view->offset(), 0.); // default
     QCOMPARE(view->firstIndex(), 0); // default
     QCOMPARE(view->orientation(), Qt::Vertical); // default
-    QCOMPARE(view->verticalOffset(), 0.); // default
 
     view->setFirstIndex(9);
     QCOMPARE(view->firstIndex(), 9);
     view->setFirstIndex(0);
     QCOMPARE(view->firstIndex(), 0);
 
-    QCOMPARE(view->horizontalOffset(), 0.);
-    view->setHorizontalOffset(0);
-    QCOMPARE(view->horizontalOffset(), 0.);
-    view->setHorizontalOffset(0.123);
-    QCOMPARE(view->horizontalOffset(), 0.123);
-    view->setHorizontalOffset(123.4);
-    QCOMPARE(view->horizontalOffset(), 123.4);
-
-    QCOMPARE(view->verticalOffset(), 0.);
-    view->setVerticalOffset(0);
-    QCOMPARE(view->verticalOffset(), 0.);
-    view->setVerticalOffset(0.123);
-    QCOMPARE(view->verticalOffset(), 0.123);
-    view->setVerticalOffset(123.4);
-    QCOMPARE(view->verticalOffset(), 123.4);
+    QCOMPARE(view->offset(), 0.);
+    view->setOffset(0);
+    QCOMPARE(view->offset(), 0.);
+    view->setOffset(0.123);
+    QCOMPARE(view->offset(), 0.123);
+    view->setOffset(123.4);
+    QCOMPARE(view->offset(), 123.4);
 
     QCOMPARE(view->orientation(), Qt::Vertical);
     view->setOrientation(Qt::Horizontal);
@@ -162,6 +155,14 @@ void tst_QtGraphicsListView::getSetCheck()
     delete model;
 }
 
+void tst_QtGraphicsListView::maximumOffset_data()
+{
+}
+
+void tst_QtGraphicsListView::maximumOffset()
+{
+}
+
 void tst_QtGraphicsListView::maximumFirstIndex_data()
 {
     QTest::addColumn<int>("count");
@@ -256,8 +257,7 @@ void tst_QtGraphicsListView::itemGeometry_data()
     QTest::addColumn<int>("orientation");
     QTest::addColumn<QSizeF>("viewSize");
     QTest::addColumn<int>("firstIndex");
-    QTest::addColumn<qreal>("horizontalOffset");
-    QTest::addColumn<qreal>("verticalOffset");
+    QTest::addColumn<qreal>("offset");
     QTest::addColumn<QList<QRectF> >("geometries");
 
     QTest::newRow("no items, vertical")
@@ -265,7 +265,7 @@ void tst_QtGraphicsListView::itemGeometry_data()
         << int(Qt::Vertical)
         << QSizeF(100, 100)
         << 0
-        << 0. << 0.
+        << 0.
         << QList<QRectF>();
 
     QTest::newRow("one item, vertical, all visible")
@@ -273,7 +273,7 @@ void tst_QtGraphicsListView::itemGeometry_data()
         << int(Qt::Vertical)
         << QSizeF(100, 100)
         << 0
-        << 0. << 0.
+        << 0.
         << (QList<QRectF>()
             << QRectF(0, 0, 20, 20));
 
@@ -282,7 +282,7 @@ void tst_QtGraphicsListView::itemGeometry_data()
         << int(Qt::Vertical)
         << QSizeF(100, 100)
         << 0
-        << 0. << 0.
+        << 0.
         << (QList<QRectF>()
             << QRectF(0, 0, 20, 20)
             << QRectF(0, 20, 20, 20)
@@ -295,7 +295,7 @@ void tst_QtGraphicsListView::itemGeometry_data()
         << int(Qt::Vertical)
         << QSizeF(100, 100)
         << 5
-        << 0. << 0.
+        << 0.
         << (QList<QRectF>()
             << QRectF()
             << QRectF()
@@ -308,12 +308,12 @@ void tst_QtGraphicsListView::itemGeometry_data()
             << QRectF(0, 60, 20, 20)
             << QRectF(0, 80, 20, 20));
 
-    QTest::newRow("ten items, vertical, vertical offset")
+    QTest::newRow("ten items, vertical, offset")
         << 10
         << int(Qt::Vertical)
         << QSizeF(100, 100)
         << 0
-        << 0. << 100.
+        << 100.
         << (QList<QRectF>()
             << QRectF(0, -100, 20, 20)
             << QRectF(0, -80, 20, 20)
@@ -331,7 +331,7 @@ void tst_QtGraphicsListView::itemGeometry_data()
         << int(Qt::Horizontal)
         << QSizeF(100, 100)
         << 0
-        << 0. << 0.
+        << 0.
         << (QList<QRectF>());
 
     QTest::newRow("one item, horizontal, all visible")
@@ -339,7 +339,7 @@ void tst_QtGraphicsListView::itemGeometry_data()
         << int(Qt::Horizontal)
         << QSizeF(100, 100)
         << 0
-        << 0. << 0.
+        << 0.
         << (QList<QRectF>()
             << QRectF(0, 0, 20, 20));
 
@@ -348,7 +348,7 @@ void tst_QtGraphicsListView::itemGeometry_data()
         << int(Qt::Horizontal)
         << QSizeF(100, 100)
         << 0
-        << 0. << 0.
+        << 0.
         << (QList<QRectF>()
             << QRectF(0, 0, 20, 20)
             << QRectF(20, 0, 20, 20)
@@ -361,7 +361,7 @@ void tst_QtGraphicsListView::itemGeometry_data()
         << int(Qt::Horizontal)
         << QSizeF(100, 100)
         << 5
-        << 0. << 0.
+        << 0.
         << (QList<QRectF>()
             << QRectF()
             << QRectF()
@@ -374,12 +374,12 @@ void tst_QtGraphicsListView::itemGeometry_data()
             << QRectF(60, 0, 20, 20)
             << QRectF(80, 0, 20, 20));
 
-    QTest::newRow("ten items, horizontal, horizontal offset")
+    QTest::newRow("ten items, horizontal, offset")
         << 10
         << int(Qt::Horizontal)
         << QSizeF(100, 100)
         << 0
-        << 100. << 0.
+        << 100.
         << (QList<QRectF>()
             << QRectF(-100, 0, 20, 20)
             << QRectF(-80, 0, 20, 20)
@@ -400,8 +400,7 @@ void tst_QtGraphicsListView::itemGeometry()
     QFETCH(int, orientation);
     QFETCH(QSizeF, viewSize);
     QFETCH(int, firstIndex);
-    QFETCH(qreal, horizontalOffset);
-    QFETCH(qreal, verticalOffset);
+    QFETCH(qreal, offset);
     QFETCH(QList<QRectF>, geometries);
 
     QtListDefaultModel model;
@@ -413,8 +412,7 @@ void tst_QtGraphicsListView::itemGeometry()
     view->setItemCreator(new QtGraphicsListViewItemCreator<GraphicsListViewItem>());
     view->setModel(&model);
     view->setFirstIndex(firstIndex);
-    view->setHorizontalOffset(horizontalOffset);
-    view->setVerticalOffset(verticalOffset);
+    view->setOffset(offset);
     view->doLayout();
 
     for (int index = 0; index < geometries.count(); ++index)
@@ -427,8 +425,7 @@ void tst_QtGraphicsListView::itemAt_data()
     QTest::addColumn<int>("orientation");
     QTest::addColumn<QSizeF>("size");
     QTest::addColumn<int>("firstIndex");
-    QTest::addColumn<qreal>("horizontalOffset");
-    QTest::addColumn<qreal>("verticalOffset");
+    QTest::addColumn<qreal>("offset");
     QTest::addColumn<QPointF>("position");
     QTest::addColumn<int>("expectedIndex");
 
@@ -437,7 +434,7 @@ void tst_QtGraphicsListView::itemAt_data()
         << int(Qt::Vertical)
         << QSizeF(100, 100)
         << 0
-        << 0. << 0.
+        << 0.
         << QPointF()
         << -1;
 
@@ -446,7 +443,7 @@ void tst_QtGraphicsListView::itemAt_data()
         << int(Qt::Vertical)
         << QSizeF(100, 100)
         << 0
-        << 0. << 0.
+        << 0.
         << QPointF(50, 10)
         << 0;
 
@@ -455,7 +452,7 @@ void tst_QtGraphicsListView::itemAt_data()
         << int(Qt::Vertical)
         << QSizeF(100, 100)
         << 0
-        << 0. << 0.
+        << 0.
         << QPointF(50, 90)
         << 4;
 
@@ -464,16 +461,16 @@ void tst_QtGraphicsListView::itemAt_data()
         << int(Qt::Vertical)
         << QSizeF(100, 100)
         << 5
-        << 0. << 0.
+        << 0.
         << QPointF(50, 90)
         << 9;
 
-    QTest::newRow("ten items, vertical, vertical offset")
+    QTest::newRow("ten items, vertical, offset")
         << 10
         << int(Qt::Vertical)
         << QSizeF(100, 100)
         << 0
-        << 0. << 100.
+        << 100.
         << QPointF(50, 90)
         << 9;
 
@@ -482,7 +479,7 @@ void tst_QtGraphicsListView::itemAt_data()
         << int(Qt::Horizontal)
         << QSizeF(100, 100)
         << 0
-        << 0. << 0.
+        << 0.
         << QPointF()
         << -1;
 
@@ -491,7 +488,7 @@ void tst_QtGraphicsListView::itemAt_data()
         << int(Qt::Horizontal)
         << QSizeF(100, 100)
         << 0
-        << 0. << 0.
+        << 0.
         << QPointF(10, 50)
         << 0;
 
@@ -500,7 +497,7 @@ void tst_QtGraphicsListView::itemAt_data()
         << int(Qt::Horizontal)
         << QSizeF(100, 100)
         << 0
-        << 0. << 0.
+        << 0.
         << QPointF(90, 50)
         << 4;
 
@@ -509,16 +506,16 @@ void tst_QtGraphicsListView::itemAt_data()
         << int(Qt::Horizontal)
         << QSizeF(100, 100)
         << 5
-        << 0. << 0.
+        << 0.
         << QPointF(90, 50)
         << 9;
 
-    QTest::newRow("ten items, horizontal, horizontal offset")
+    QTest::newRow("ten items, horizontal, offset")
         << 10
         << int(Qt::Horizontal)
         << QSizeF(100, 100)
         << 0
-        << 100. << 0.
+        << 100.
         << QPointF(90, 50)
         << 9;
 
@@ -530,8 +527,7 @@ void tst_QtGraphicsListView::itemAt()
     QFETCH(int, orientation);
     QFETCH(QSizeF, size);
     QFETCH(int, firstIndex);
-    QFETCH(qreal, horizontalOffset);
-    QFETCH(qreal, verticalOffset);
+    QFETCH(qreal, offset);
     QFETCH(QPointF, position);
     QFETCH(int, expectedIndex);
 
@@ -544,8 +540,7 @@ void tst_QtGraphicsListView::itemAt()
     view->setItemCreator(new QtGraphicsListViewItemCreator<GraphicsListViewItem>());
     view->setModel(&model);
     view->setFirstIndex(firstIndex);
-    view->setHorizontalOffset(horizontalOffset);
-    view->setVerticalOffset(verticalOffset);
+    view->setOffset(offset);
     view->doLayout();
 
     QCOMPARE(view->itemAt(position), expectedIndex);
@@ -557,8 +552,7 @@ void tst_QtGraphicsListView::layout_data()
     QTest::addColumn<int>("orientation");
     QTest::addColumn<QSizeF>("viewSize");
     QTest::addColumn<int>("firstIndex");
-    QTest::addColumn<qreal>("horizontalOffset");
-    QTest::addColumn<qreal>("verticalOffset");
+    QTest::addColumn<qreal>("offset");
     QTest::addColumn<QList<int> >("expectedIndexes");
     QTest::addColumn<QList<QRectF> >("expectedGeometries");
 
@@ -567,7 +561,7 @@ void tst_QtGraphicsListView::layout_data()
         << int(Qt::Vertical)
         << QSizeF(100, 100)
         << 0
-        << 0. << 0.
+        << 0.
         << QList<int>()
         << QList<QRectF>();
 
@@ -576,7 +570,7 @@ void tst_QtGraphicsListView::layout_data()
         << int(Qt::Vertical)
         << QSizeF(100, 100)
         << 0
-        << 0. << 0.
+        << 0.
         << (QList<int>() << 0)
         << (QList<QRectF>() << QRectF(0, 0, 20, 20));
 
@@ -585,7 +579,7 @@ void tst_QtGraphicsListView::layout_data()
         << int(Qt::Vertical)
         << QSizeF(100, 100)
         << 0
-        << 0. << 0.
+        << 0.
         << (QList<int>()
             << 0 << 1 << 2 << 3 << 4)
         << (QList<QRectF>()
@@ -600,7 +594,7 @@ void tst_QtGraphicsListView::layout_data()
         << int(Qt::Vertical)
         << QSizeF(100, 100)
         << 0
-        << 0. << 0.
+        << 0.
         << (QList<int>()
             << 0 << 1 << 2 << 3 << 4)
         << (QList<QRectF>()
@@ -615,7 +609,7 @@ void tst_QtGraphicsListView::layout_data()
         << int(Qt::Vertical)
         << QSizeF(100, 100)
         << 5
-        << 0. << 0.
+        << 0.
         << (QList<int>()
             << 5 << 6 << 7 << 8 << 9)
         << (QList<QRectF>()
@@ -625,12 +619,12 @@ void tst_QtGraphicsListView::layout_data()
             << QRectF(0, 60, 20, 20)
             << QRectF(0, 80, 20, 20));
 
-    QTest::newRow("ten items, vertical, five visible, vertical offset")
+    QTest::newRow("ten items, vertical, five visible, offset")
         << 10
         << int(Qt::Vertical)
         << QSizeF(100, 100)
         << 0
-        << 0. << 10.
+        << 10.
         << (QList<int>()
             << 0 << 1 << 2 << 3 << 4 << 5)
         << (QList<QRectF>()
@@ -646,7 +640,7 @@ void tst_QtGraphicsListView::layout_data()
         << int(Qt::Horizontal)
         << QSizeF(100, 100)
         << 0
-        << 0. << 0.
+        << 0.
         << QList<int>()
         << QList<QRectF>();
 
@@ -655,7 +649,7 @@ void tst_QtGraphicsListView::layout_data()
         << int(Qt::Horizontal)
         << QSizeF(100, 100)
         << 0
-        << 0. << 0.
+        << 0.
         << (QList<int>() << 0)
         << (QList<QRectF>() << QRectF(0, 0, 20, 20));
 
@@ -664,7 +658,7 @@ void tst_QtGraphicsListView::layout_data()
         << int(Qt::Horizontal)
         << QSizeF(100, 100)
         << 0
-        << 0. << 0.
+        << 0.
         << (QList<int>()
             << 0 << 1 << 2 << 3 << 4)
         << (QList<QRectF>()
@@ -679,7 +673,7 @@ void tst_QtGraphicsListView::layout_data()
         << int(Qt::Horizontal)
         << QSizeF(100, 100)
         << 0
-        << 0. << 0.
+        << 0.
         << (QList<int>()
             << 0 << 1 << 2 << 3 << 4)
         << (QList<QRectF>()
@@ -694,7 +688,7 @@ void tst_QtGraphicsListView::layout_data()
         << int(Qt::Horizontal)
         << QSizeF(100, 100)
         << 5
-        << 0. << 0.
+        << 0.
         << (QList<int>()
             << 5 << 6 << 7 << 8 << 9)
         << (QList<QRectF>()
@@ -704,12 +698,12 @@ void tst_QtGraphicsListView::layout_data()
             << QRectF(60, 0, 20, 20)
             << QRectF(80, 0, 20, 20));
 
-    QTest::newRow("ten items, horizontal, five visible, horizontal offset")
+    QTest::newRow("ten items, horizontal, five visible, offset")
         << 10
         << int(Qt::Horizontal)
         << QSizeF(100, 100)
         << 0
-        << 10. << 0.
+        << 10.
         << (QList<int>()
             << 0 << 1 << 2 << 3 << 4 << 5)
         << (QList<QRectF>()
@@ -727,8 +721,7 @@ void tst_QtGraphicsListView::layout()
     QFETCH(int, orientation);
     QFETCH(QSizeF, viewSize);
     QFETCH(int, firstIndex);
-    QFETCH(qreal, horizontalOffset);
-    QFETCH(qreal, verticalOffset);
+    QFETCH(qreal, offset);
     QFETCH(QList<int>, expectedIndexes);
     QFETCH(QList<QRectF>, expectedGeometries);
 
@@ -741,8 +734,7 @@ void tst_QtGraphicsListView::layout()
     view->setItemCreator(new QtGraphicsListViewItemCreator<GraphicsListViewItem>());
     view->setModel(&model);
     view->setFirstIndex(firstIndex);
-    view->setHorizontalOffset(horizontalOffset);
-    view->setVerticalOffset(verticalOffset);
+    view->setOffset(offset);
     view->doLayout();
 
     for (int j = 0; j < expectedIndexes.count(); ++j) {