diff options
author | J-P Nurmi <jpnurmi@digia.com> | 2014-03-03 15:53:27 +0100 |
---|---|---|
committer | J-P Nurmi <jpnurmi@digia.com> | 2014-08-08 00:25:49 +0200 |
commit | ce5dff18b9a61707617080be7be0cd688996ad6f (patch) | |
tree | ec8db965c99393e2540e776bff986e0abc99a029 /tests/auto/quick/qquicklistview/tst_qquicklistview.cpp | |
parent | 08457385be89603d7c5ce84dce9ee36e0c6a0263 (diff) |
ListView: add support for "pull back" header & footer
[ChangeLog][QtQuick][ListView] Introduced headerPositioning and
footerPositioning properties to control whether header and footer
are positioned inline, as overlays, or so that they slide away and
can be pulled back regardless of the content position.
Change-Id: Ifef1faf1ce6acf2b55cd1b6408e22ec2de841409
Reviewed-by: Alan Alpert <aalpert@blackberry.com>
Reviewed-by: Shawn Rutledge <shawn.rutledge@digia.com>
Diffstat (limited to 'tests/auto/quick/qquicklistview/tst_qquicklistview.cpp')
-rw-r--r-- | tests/auto/quick/qquicklistview/tst_qquicklistview.cpp | 409 |
1 files changed, 409 insertions, 0 deletions
diff --git a/tests/auto/quick/qquicklistview/tst_qquicklistview.cpp b/tests/auto/quick/qquicklistview/tst_qquicklistview.cpp index c8ab62cbbc..39610e57f7 100644 --- a/tests/auto/quick/qquicklistview/tst_qquicklistview.cpp +++ b/tests/auto/quick/qquicklistview/tst_qquicklistview.cpp @@ -228,6 +228,9 @@ private slots: void QTBUG_36481(); void QTBUG_35920(); + void stickyPositioning(); + void stickyPositioning_data(); + void roundingErrors(); void roundingErrors_data(); @@ -7309,6 +7312,412 @@ void tst_QQuickListView::QTBUG_35920() QTest::mouseRelease(window.data(), Qt::LeftButton, 0, QPoint(10,100)); } +Q_DECLARE_METATYPE(Qt::Orientation) + +void tst_QQuickListView::stickyPositioning() +{ + QFETCH(QString, fileName); + + QFETCH(Qt::Orientation, orientation); + QFETCH(Qt::LayoutDirection, layoutDirection); + QFETCH(QQuickItemView::VerticalLayoutDirection, verticalLayoutDirection); + + QFETCH(int, positionIndex); + QFETCH(QQuickItemView::PositionMode, positionMode); + QFETCH(QList<QPointF>, movement); + + QFETCH(QPointF, headerPos); + QFETCH(QPointF, footerPos); + + QQuickView *window = createView(); + + QaimModel model; + for (int i = 0; i < 20; i++) + model.addItem(QString::number(i), QString::number(i/10)); + + QQmlContext *ctxt = window->rootContext(); + ctxt->setContextProperty("testModel", &model); + ctxt->setContextProperty("testOrientation", orientation); + ctxt->setContextProperty("testLayoutDirection", layoutDirection); + ctxt->setContextProperty("testVerticalLayoutDirection", verticalLayoutDirection); + + window->setSource(testFileUrl(fileName)); + window->show(); + QVERIFY(QTest::qWaitForWindowExposed(window)); + + QQuickListView *listview = findItem<QQuickListView>(window->rootObject(), "list"); + QVERIFY(listview); + + QQuickItem *contentItem = listview->contentItem(); + QVERIFY(contentItem); + + listview->positionViewAtIndex(positionIndex, positionMode); + + foreach (const QPointF &offset, movement) { + listview->setContentX(listview->contentX() + offset.x()); + listview->setContentY(listview->contentY() + offset.y()); + } + + if (listview->header()) { + QQuickItem *headerItem = listview->headerItem(); + QVERIFY(headerItem); + QPointF actualPos = listview->mapFromItem(contentItem, headerItem->position()); + QCOMPARE(actualPos, headerPos); + } + + if (listview->footer()) { + QQuickItem *footerItem = listview->footerItem(); + QVERIFY(footerItem); + QPointF actualPos = listview->mapFromItem(contentItem, footerItem->position()); + QCOMPARE(actualPos, footerPos); + } + + delete window; +} + +void tst_QQuickListView::stickyPositioning_data() +{ + qRegisterMetaType<Qt::Orientation>(); + qRegisterMetaType<Qt::LayoutDirection>(); + qRegisterMetaType<QQuickItemView::VerticalLayoutDirection>(); + qRegisterMetaType<QQuickItemView::PositionMode>(); + + QTest::addColumn<QString>("fileName"); + + QTest::addColumn<Qt::Orientation>("orientation"); + QTest::addColumn<Qt::LayoutDirection>("layoutDirection"); + QTest::addColumn<QQuickItemView::VerticalLayoutDirection>("verticalLayoutDirection"); + + QTest::addColumn<int>("positionIndex"); + QTest::addColumn<QQuickItemView::PositionMode>("positionMode"); + QTest::addColumn<QList<QPointF> >("movement"); + + QTest::addColumn<QPointF>("headerPos"); + QTest::addColumn<QPointF>("footerPos"); + + // header at the top + QTest::newRow("top header") << "stickyPositioning-header.qml" + << Qt::Vertical << Qt::LeftToRight << QQuickListView::TopToBottom + << 0 << QQuickItemView::Beginning << QList<QPointF>() + << QPointF(0,-10) << QPointF(); + + QTest::newRow("top header: 1/2 up") << "stickyPositioning-header.qml" + << Qt::Vertical << Qt::LeftToRight << QQuickListView::TopToBottom + << 1 << QQuickItemView::Beginning << (QList<QPointF>() << QPointF(0,-5)) + << QPointF(0,-5) << QPointF(); + + QTest::newRow("top header: up") << "stickyPositioning-header.qml" + << Qt::Vertical << Qt::LeftToRight << QQuickListView::TopToBottom + << 2 << QQuickItemView::Beginning << (QList<QPointF>() << QPointF(0,-15)) + << QPointF(0,0) << QPointF(); + + QTest::newRow("top header: 1/2 down") << "stickyPositioning-header.qml" + << Qt::Vertical << Qt::LeftToRight << QQuickListView::TopToBottom + << 3 << QQuickItemView::Beginning << (QList<QPointF>() << QPointF(0,-15) << QPointF(0,5)) + << QPointF(0,-5) << QPointF(); + + QTest::newRow("top header: down") << "stickyPositioning-header.qml" + << Qt::Vertical << Qt::LeftToRight << QQuickListView::TopToBottom + << 4 << QQuickItemView::Beginning << (QList<QPointF>() << QPointF(0,-15) << QPointF(0,10)) + << QPointF(0,-10) << QPointF(); + + + // footer at the top + QTest::newRow("top footer") << "stickyPositioning-footer.qml" + << Qt::Vertical << Qt::LeftToRight << QQuickListView::BottomToTop + << 19 << QQuickItemView::End << QList<QPointF>() + << QPointF() << QPointF(0,-10); + + QTest::newRow("top footer: 1/2 up") << "stickyPositioning-footer.qml" + << Qt::Vertical << Qt::LeftToRight << QQuickListView::BottomToTop + << 18 << QQuickItemView::End << (QList<QPointF>() << QPointF(0,-5)) + << QPointF() << QPointF(0,-5); + + QTest::newRow("top footer: up") << "stickyPositioning-footer.qml" + << Qt::Vertical << Qt::LeftToRight << QQuickListView::BottomToTop + << 17 << QQuickItemView::End << (QList<QPointF>() << QPointF(0,-15)) + << QPointF() << QPointF(0,0); + + QTest::newRow("top footer: 1/2 down") << "stickyPositioning-footer.qml" + << Qt::Vertical << Qt::LeftToRight << QQuickListView::BottomToTop + << 16 << QQuickItemView::End << (QList<QPointF>() << QPointF(0,-15) << QPointF(0,5)) + << QPointF() << QPointF(0,-5); + + QTest::newRow("top footer: down") << "stickyPositioning-footer.qml" + << Qt::Vertical << Qt::LeftToRight << QQuickListView::BottomToTop + << 15 << QQuickItemView::End << (QList<QPointF>() << QPointF(0,-15) << QPointF(0,10)) + << QPointF() << QPointF(0,-10); + + + // header at the bottom + QTest::newRow("bottom header") << "stickyPositioning-header.qml" + << Qt::Vertical << Qt::LeftToRight << QQuickListView::BottomToTop + << 0 << QQuickItemView::Beginning << QList<QPointF>() + << QPointF(0,100) << QPointF(); + + QTest::newRow("bottom header: 1/2 down") << "stickyPositioning-header.qml" + << Qt::Vertical << Qt::LeftToRight << QQuickListView::BottomToTop + << 1 << QQuickItemView::Beginning << (QList<QPointF>() << QPointF(0,5)) + << QPointF(0,95) << QPointF(); + + QTest::newRow("bottom header: down") << "stickyPositioning-header.qml" + << Qt::Vertical << Qt::LeftToRight << QQuickListView::BottomToTop + << 2 << QQuickItemView::Beginning << (QList<QPointF>() << QPointF(0,15)) + << QPointF(0,90) << QPointF(); + + QTest::newRow("bottom header: 1/2 up") << "stickyPositioning-header.qml" + << Qt::Vertical << Qt::LeftToRight << QQuickListView::BottomToTop + << 3 << QQuickItemView::Beginning << (QList<QPointF>() << QPointF(0,15) << QPointF(0,-5)) + << QPointF(0,95) << QPointF(); + + QTest::newRow("bottom header: up") << "stickyPositioning-header.qml" + << Qt::Vertical << Qt::LeftToRight << QQuickListView::BottomToTop + << 4 << QQuickItemView::Beginning << (QList<QPointF>() << QPointF(0,15) << QPointF(0,-10)) + << QPointF(0,100) << QPointF(); + + + // footer at the bottom + QTest::newRow("bottom footer") << "stickyPositioning-footer.qml" + << Qt::Vertical << Qt::LeftToRight << QQuickListView::TopToBottom + << 19 << QQuickItemView::End << QList<QPointF>() + << QPointF() << QPointF(0,100); + + QTest::newRow("bottom footer: 1/2 down") << "stickyPositioning-footer.qml" + << Qt::Vertical << Qt::LeftToRight << QQuickListView::TopToBottom + << 18 << QQuickItemView::End << (QList<QPointF>() << QPointF(0,5)) + << QPointF() << QPointF(0,95); + + QTest::newRow("bottom footer: down") << "stickyPositioning-footer.qml" + << Qt::Vertical << Qt::LeftToRight << QQuickListView::TopToBottom + << 17 << QQuickItemView::End << (QList<QPointF>() << QPointF(0,15)) + << QPointF() << QPointF(0,90); + + QTest::newRow("bottom footer: 1/2 up") << "stickyPositioning-footer.qml" + << Qt::Vertical << Qt::LeftToRight << QQuickListView::TopToBottom + << 16 << QQuickItemView::End << (QList<QPointF>() << QPointF(0,15) << QPointF(0,-5)) + << QPointF() << QPointF(0,95); + + QTest::newRow("bottom footer: up") << "stickyPositioning-footer.qml" + << Qt::Vertical << Qt::LeftToRight << QQuickListView::TopToBottom + << 15 << QQuickItemView::End << (QList<QPointF>() << QPointF(0,15) << QPointF(0,-10)) + << QPointF() << QPointF(0,100); + + + // header at the top (& footer at the bottom) + QTest::newRow("top header & bottom footer") << "stickyPositioning-both.qml" + << Qt::Vertical << Qt::LeftToRight << QQuickListView::TopToBottom + << 0 << QQuickItemView::Beginning << QList<QPointF>() + << QPointF(0,-10) << QPointF(0,90); + + QTest::newRow("top header & bottom footer: 1/2 up") << "stickyPositioning-both.qml" + << Qt::Vertical << Qt::LeftToRight << QQuickListView::TopToBottom + << 1 << QQuickItemView::Beginning << (QList<QPointF>() << QPointF(0,-5)) + << QPointF(0,-5) << QPointF(0,95); + + QTest::newRow("top header & bottom footer: up") << "stickyPositioning-both.qml" + << Qt::Vertical << Qt::LeftToRight << QQuickListView::TopToBottom + << 2 << QQuickItemView::Beginning << (QList<QPointF>() << QPointF(0,-15)) + << QPointF(0,0) << QPointF(0,100); + + QTest::newRow("top header & bottom footer: 1/2 down") << "stickyPositioning-both.qml" + << Qt::Vertical << Qt::LeftToRight << QQuickListView::TopToBottom + << 3 << QQuickItemView::Beginning << (QList<QPointF>() << QPointF(0,-15) << QPointF(0,5)) + << QPointF(0,-5) << QPointF(0,95); + + QTest::newRow("top header & bottom footer: down") << "stickyPositioning-both.qml" + << Qt::Vertical << Qt::LeftToRight << QQuickListView::TopToBottom + << 4 << QQuickItemView::Beginning << (QList<QPointF>() << QPointF(0,-15) << QPointF(0,10)) + << QPointF(0,-10) << QPointF(0,90); + + + // footer at the bottom (& header at the top) + QTest::newRow("bottom footer & top header") << "stickyPositioning-both.qml" + << Qt::Vertical << Qt::LeftToRight << QQuickListView::TopToBottom + << 1 << QQuickItemView::Beginning << QList<QPointF>() + << QPointF(0,-10) << QPointF(0,90); + + QTest::newRow("bottom footer & top header: 1/2 down") << "stickyPositioning-both.qml" + << Qt::Vertical << Qt::LeftToRight << QQuickListView::TopToBottom + << 1 << QQuickItemView::Beginning << (QList<QPointF>() << QPointF(0,5)) + << QPointF(0,-10) << QPointF(0,90); + + QTest::newRow("bottom footer & top header: down") << "stickyPositioning-both.qml" + << Qt::Vertical << Qt::LeftToRight << QQuickListView::TopToBottom + << 2 << QQuickItemView::Beginning << (QList<QPointF>() << QPointF(0,15)) + << QPointF(0,-10) << QPointF(0,90); + + QTest::newRow("bottom footer & top header: 1/2 up") << "stickyPositioning-both.qml" + << Qt::Vertical << Qt::LeftToRight << QQuickListView::TopToBottom + << 3 << QQuickItemView::Beginning << (QList<QPointF>() << QPointF(0,15) << QPointF(0,-5)) + << QPointF(0,-5) << QPointF(0,95); + + QTest::newRow("bottom footer & top header: up") << "stickyPositioning-both.qml" + << Qt::Vertical << Qt::LeftToRight << QQuickListView::TopToBottom + << 4 << QQuickItemView::Beginning << (QList<QPointF>() << QPointF(0,15) << QPointF(0,-10)) + << QPointF(0,0) << QPointF(0,100); + + // header on the left + QTest::newRow("left header") << "stickyPositioning-header.qml" + << Qt::Horizontal << Qt::LeftToRight << QQuickListView::TopToBottom + << 0 << QQuickItemView::Beginning << QList<QPointF>() + << QPointF(-10,0) << QPointF(); + + QTest::newRow("left header: 1/2 left") << "stickyPositioning-header.qml" + << Qt::Horizontal << Qt::LeftToRight << QQuickListView::TopToBottom + << 1 << QQuickItemView::Beginning << (QList<QPointF>() << QPointF(-5,0)) + << QPointF(-5,0) << QPointF(); + + QTest::newRow("left header: left") << "stickyPositioning-header.qml" + << Qt::Horizontal << Qt::LeftToRight << QQuickListView::TopToBottom + << 2 << QQuickItemView::Beginning << (QList<QPointF>() << QPointF(-15,0)) + << QPointF(0,0) << QPointF(); + + QTest::newRow("left header: 1/2 right") << "stickyPositioning-header.qml" + << Qt::Horizontal << Qt::LeftToRight << QQuickListView::TopToBottom + << 3 << QQuickItemView::Beginning << (QList<QPointF>() << QPointF(-15,0) << QPointF(5,0)) + << QPointF(-5,0) << QPointF(); + + QTest::newRow("left header: right") << "stickyPositioning-header.qml" + << Qt::Horizontal << Qt::LeftToRight << QQuickListView::TopToBottom + << 4 << QQuickItemView::Beginning << (QList<QPointF>() << QPointF(-15,0) << QPointF(10,0)) + << QPointF(-10,0) << QPointF(); + + + // footer on the left + QTest::newRow("left footer") << "stickyPositioning-footer.qml" + << Qt::Horizontal << Qt::RightToLeft << QQuickListView::TopToBottom + << 19 << QQuickItemView::End << QList<QPointF>() + << QPointF() << QPointF(-10,0); + + QTest::newRow("left footer: 1/2 left") << "stickyPositioning-footer.qml" + << Qt::Horizontal << Qt::RightToLeft << QQuickListView::TopToBottom + << 18 << QQuickItemView::End << (QList<QPointF>() << QPointF(-5,0)) + << QPointF() << QPointF(-5,0); + + QTest::newRow("left footer: left") << "stickyPositioning-footer.qml" + << Qt::Horizontal << Qt::RightToLeft << QQuickListView::TopToBottom + << 17 << QQuickItemView::End << (QList<QPointF>() << QPointF(-15,0)) + << QPointF() << QPointF(0,0); + + QTest::newRow("left footer: 1/2 right") << "stickyPositioning-footer.qml" + << Qt::Horizontal << Qt::RightToLeft << QQuickListView::TopToBottom + << 16 << QQuickItemView::End << (QList<QPointF>() << QPointF(-15,0) << QPointF(5,0)) + << QPointF() << QPointF(-5,0); + + QTest::newRow("left footer: right") << "stickyPositioning-footer.qml" + << Qt::Horizontal << Qt::RightToLeft << QQuickListView::TopToBottom + << 15 << QQuickItemView::End << (QList<QPointF>() << QPointF(-15,0) << QPointF(10,0)) + << QPointF() << QPointF(-10,0); + + + // header on the right + QTest::newRow("right header") << "stickyPositioning-header.qml" + << Qt::Horizontal << Qt::RightToLeft << QQuickListView::TopToBottom + << 0 << QQuickItemView::Beginning << QList<QPointF>() + << QPointF(100,0) << QPointF(); + + QTest::newRow("right header: 1/2 right") << "stickyPositioning-header.qml" + << Qt::Horizontal << Qt::RightToLeft << QQuickListView::TopToBottom + << 1 << QQuickItemView::Beginning << (QList<QPointF>() << QPointF(5,0)) + << QPointF(95,0) << QPointF(); + + QTest::newRow("right header: right") << "stickyPositioning-header.qml" + << Qt::Horizontal << Qt::RightToLeft << QQuickListView::TopToBottom + << 2 << QQuickItemView::Beginning << (QList<QPointF>() << QPointF(15,0)) + << QPointF(90,0) << QPointF(); + + QTest::newRow("right header: 1/2 left") << "stickyPositioning-header.qml" + << Qt::Horizontal << Qt::RightToLeft << QQuickListView::TopToBottom + << 3 << QQuickItemView::Beginning << (QList<QPointF>() << QPointF(15,0) << QPointF(-5,0)) + << QPointF(95,0) << QPointF(); + + QTest::newRow("right header: left") << "stickyPositioning-header.qml" + << Qt::Horizontal << Qt::RightToLeft << QQuickListView::TopToBottom + << 4 << QQuickItemView::Beginning << (QList<QPointF>() << QPointF(15,0) << QPointF(-10,0)) + << QPointF(100,0) << QPointF(); + + + // footer on the right + QTest::newRow("right footer") << "stickyPositioning-footer.qml" + << Qt::Horizontal << Qt::LeftToRight << QQuickListView::TopToBottom + << 19 << QQuickItemView::End << QList<QPointF>() + << QPointF() << QPointF(100,0); + + QTest::newRow("right footer: 1/2 right") << "stickyPositioning-footer.qml" + << Qt::Horizontal << Qt::LeftToRight << QQuickListView::TopToBottom + << 18 << QQuickItemView::End << (QList<QPointF>() << QPointF(5,0)) + << QPointF() << QPointF(95,0); + + QTest::newRow("right footer: right") << "stickyPositioning-footer.qml" + << Qt::Horizontal << Qt::LeftToRight << QQuickListView::TopToBottom + << 17 << QQuickItemView::End << (QList<QPointF>() << QPointF(15,0)) + << QPointF() << QPointF(90,0); + + QTest::newRow("right footer: 1/2 left") << "stickyPositioning-footer.qml" + << Qt::Horizontal << Qt::LeftToRight << QQuickListView::TopToBottom + << 16 << QQuickItemView::End << (QList<QPointF>() << QPointF(15,0) << QPointF(-5,0)) + << QPointF() << QPointF(95,0); + + QTest::newRow("right footer: left") << "stickyPositioning-footer.qml" + << Qt::Horizontal << Qt::LeftToRight << QQuickListView::TopToBottom + << 15 << QQuickItemView::End << (QList<QPointF>() << QPointF(15,0) << QPointF(-10,0)) + << QPointF() << QPointF(100,0); + + + // header on the left (& footer on the right) + QTest::newRow("left header & right footer") << "stickyPositioning-both.qml" + << Qt::Horizontal << Qt::LeftToRight << QQuickListView::TopToBottom + << 0 << QQuickItemView::Beginning << QList<QPointF>() + << QPointF(-10,0) << QPointF(90,0); + + QTest::newRow("left header & right footer: 1/2 left") << "stickyPositioning-both.qml" + << Qt::Horizontal << Qt::LeftToRight << QQuickListView::TopToBottom + << 1 << QQuickItemView::Beginning << (QList<QPointF>() << QPointF(-5,0)) + << QPointF(-5,0) << QPointF(95,0); + + QTest::newRow("left header & right footer: left") << "stickyPositioning-both.qml" + << Qt::Horizontal << Qt::LeftToRight << QQuickListView::TopToBottom + << 2 << QQuickItemView::Beginning << (QList<QPointF>() << QPointF(-15,0)) + << QPointF(0,0) << QPointF(100,0); + + QTest::newRow("left header & right footer: 1/2 right") << "stickyPositioning-both.qml" + << Qt::Horizontal << Qt::LeftToRight << QQuickListView::TopToBottom + << 3 << QQuickItemView::Beginning << (QList<QPointF>() << QPointF(-15,0) << QPointF(5,0)) + << QPointF(-5,0) << QPointF(95,0); + + QTest::newRow("left header & right footer: right") << "stickyPositioning-both.qml" + << Qt::Horizontal << Qt::LeftToRight << QQuickListView::TopToBottom + << 4 << QQuickItemView::Beginning << (QList<QPointF>() << QPointF(-15,0) << QPointF(10,0)) + << QPointF(-10,0) << QPointF(90,0); + + + // footer on the right (& header on the left) + QTest::newRow("right footer & left header") << "stickyPositioning-both.qml" + << Qt::Horizontal << Qt::LeftToRight << QQuickListView::TopToBottom + << 1 << QQuickItemView::Beginning << QList<QPointF>() + << QPointF(-10,0) << QPointF(90,0); + + QTest::newRow("right footer & left header: 1/2 right") << "stickyPositioning-both.qml" + << Qt::Horizontal << Qt::LeftToRight << QQuickListView::TopToBottom + << 1 << QQuickItemView::Beginning << (QList<QPointF>() << QPointF(5,0)) + << QPointF(-10,0) << QPointF(90,0); + + QTest::newRow("right footer & left header: right") << "stickyPositioning-both.qml" + << Qt::Horizontal << Qt::LeftToRight << QQuickListView::TopToBottom + << 2 << QQuickItemView::Beginning << (QList<QPointF>() << QPointF(15,0)) + << QPointF(-10,0) << QPointF(90,0); + + QTest::newRow("right footer & left header: 1/2 left") << "stickyPositioning-both.qml" + << Qt::Horizontal << Qt::LeftToRight << QQuickListView::TopToBottom + << 3 << QQuickItemView::Beginning << (QList<QPointF>() << QPointF(15,0) << QPointF(-5,0)) + << QPointF(-5,0) << QPointF(95,0); + + QTest::newRow("right footer & left header: left") << "stickyPositioning-both.qml" + << Qt::Horizontal << Qt::LeftToRight << QQuickListView::TopToBottom + << 4 << QQuickItemView::Beginning << (QList<QPointF>() << QPointF(15,0) << QPointF(-10,0)) + << QPointF(0,0) << QPointF(100,0); +} + void tst_QQuickListView::roundingErrors() { QFETCH(bool, pixelAligned); |