diff options
author | J-P Nurmi <jpnurmi@digia.com> | 2014-03-10 15:58:10 +0100 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-03-18 09:05:57 +0100 |
commit | c4c5129632591738c290058abab281ad1b1493c1 (patch) | |
tree | 1281f2a4f3ea9da5da55a7720def36e077716afe /tests/auto/quick/qquickgridview | |
parent | fa24ef3d721a7b94d0c5abbc6c9558e74bdb0f3d (diff) |
Item views: improve initial Z-value handling
Respect the initial Z-values of item, highlight, header, footer and
section delegate instances. Mention also the default values in docs.
Change-Id: I2ce4bb537898a0f5fdfa776b79d5747b1c080a7b
Reviewed-by: Michael Brasser <michael.brasser@live.com>
Reviewed-by: Alan Alpert <aalpert@blackberry.com>
Reviewed-by: Martin Jones <martin.jones@jollamobile.com>
Diffstat (limited to 'tests/auto/quick/qquickgridview')
-rw-r--r-- | tests/auto/quick/qquickgridview/data/boundZValues.qml | 46 | ||||
-rw-r--r-- | tests/auto/quick/qquickgridview/data/constantZValues.qml | 46 | ||||
-rw-r--r-- | tests/auto/quick/qquickgridview/data/defaultZValues.qml (renamed from tests/auto/quick/qquickgridview/data/initialZValues.qml) | 10 | ||||
-rw-r--r-- | tests/auto/quick/qquickgridview/tst_qquickgridview.cpp | 22 |
4 files changed, 117 insertions, 7 deletions
diff --git a/tests/auto/quick/qquickgridview/data/boundZValues.qml b/tests/auto/quick/qquickgridview/data/boundZValues.qml new file mode 100644 index 0000000000..7a1ca48a81 --- /dev/null +++ b/tests/auto/quick/qquickgridview/data/boundZValues.qml @@ -0,0 +1,46 @@ +import QtQuick 2.0 + +Rectangle { + width: 240 + height: 320 + + GridView { + id: grid + + property real itemZ: 342 + property real headerZ: 341 + property real footerZ: 340 + property real highlightZ: 339 + + anchors.fill: parent + objectName: "grid" + model: ListModel { ListElement { text: "text" } } + currentIndex: 0 + + delegate: Text { + objectName: "wrapper" + font.pointSize: 20 + text: index + z: grid.itemZ + } + + header: Rectangle { + width: 240 + height: 30 + z: grid.headerZ + } + + footer: Rectangle { + width: 240 + height: 30 + z: grid.footerZ + } + + highlight: Rectangle { + width: 240 + height: 30 + z: grid.highlightZ + } + } +} + diff --git a/tests/auto/quick/qquickgridview/data/constantZValues.qml b/tests/auto/quick/qquickgridview/data/constantZValues.qml new file mode 100644 index 0000000000..7cf564a12e --- /dev/null +++ b/tests/auto/quick/qquickgridview/data/constantZValues.qml @@ -0,0 +1,46 @@ +import QtQuick 2.0 + +Rectangle { + width: 240 + height: 320 + + GridView { + id: grid + + property real itemZ: 241 + property real headerZ: 242 + property real footerZ: 243 + property real highlightZ: 244 + + anchors.fill: parent + objectName: "grid" + model: ListModel { ListElement { text: "text" } } + currentIndex: 0 + + delegate: Text { + objectName: "wrapper" + font.pointSize: 20 + text: index + z: 241 + } + + header: Rectangle { + width: 240 + height: 30 + z: 242 + } + + footer: Rectangle { + width: 240 + height: 30 + z: 243 + } + + highlight: Rectangle { + width: 240 + height: 30 + z: 244 + } + } +} + diff --git a/tests/auto/quick/qquickgridview/data/initialZValues.qml b/tests/auto/quick/qquickgridview/data/defaultZValues.qml index 9768b2c695..53f11bb2da 100644 --- a/tests/auto/quick/qquickgridview/data/initialZValues.qml +++ b/tests/auto/quick/qquickgridview/data/defaultZValues.qml @@ -7,11 +7,15 @@ Rectangle { GridView { id: grid - property real initialZ: 342 + property real itemZ: 1 + property real headerZ: 1 + property real footerZ: 1 + property real highlightZ: 0 anchors.fill: parent objectName: "grid" - model: ListModel {} + model: ListModel { ListElement { text: "text" } } + currentIndex: 0 delegate: Text { objectName: "wrapper" @@ -22,13 +26,11 @@ Rectangle { header: Rectangle { width: 240 height: 30 - z: grid.initialZ } footer: Rectangle { width: 240 height: 30 - z: grid.initialZ } } } diff --git a/tests/auto/quick/qquickgridview/tst_qquickgridview.cpp b/tests/auto/quick/qquickgridview/tst_qquickgridview.cpp index f4eec18690..890174e2a8 100644 --- a/tests/auto/quick/qquickgridview/tst_qquickgridview.cpp +++ b/tests/auto/quick/qquickgridview/tst_qquickgridview.cpp @@ -121,6 +121,7 @@ private slots: void footer(); void footer_data(); void initialZValues(); + void initialZValues_data(); void header(); void header_data(); void extents(); @@ -3200,8 +3201,9 @@ void tst_QQuickGridView::footer_data() void tst_QQuickGridView::initialZValues() { + QFETCH(QString, fileName); QQuickView *window = createView(); - window->setSource(testFileUrl("initialZValues.qml")); + window->setSource(testFileUrl(fileName)); qApp->processEvents(); QQuickGridView *gridview = findItem<QQuickGridView>(window->rootObject(), "grid"); @@ -3209,15 +3211,29 @@ void tst_QQuickGridView::initialZValues() QQuickItem *contentItem = gridview->contentItem(); QTRY_VERIFY(contentItem != 0); + QVERIFY(gridview->currentItem()); + QTRY_COMPARE(gridview->currentItem()->z(), gridview->property("itemZ").toReal()); + QVERIFY(gridview->headerItem()); - QTRY_COMPARE(gridview->headerItem()->z(), gridview->property("initialZ").toReal()); + QTRY_COMPARE(gridview->headerItem()->z(), gridview->property("headerZ").toReal()); QVERIFY(gridview->footerItem()); - QTRY_COMPARE(gridview->footerItem()->z(), gridview->property("initialZ").toReal()); + QTRY_COMPARE(gridview->footerItem()->z(), gridview->property("footerZ").toReal()); + + QVERIFY(gridview->highlightItem()); + QTRY_COMPARE(gridview->highlightItem()->z(), gridview->property("highlightZ").toReal()); delete window; } +void tst_QQuickGridView::initialZValues_data() +{ + QTest::addColumn<QString>("fileName"); + QTest::newRow("defaults") << "defaultZValues.qml"; + QTest::newRow("constants") << "constantZValues.qml"; + QTest::newRow("bindings") << "boundZValues.qml"; +} + void tst_QQuickGridView::header() { QFETCH(QQuickGridView::Flow, flow); |