diff options
author | Bea Lam <bea.lam@nokia.com> | 2012-05-25 17:33:02 +1000 |
---|---|---|
committer | Qt by Nokia <qt-info@nokia.com> | 2012-05-28 02:39:10 +0200 |
commit | 1deba22774e59458dc2e485f1cdf8f5b547d2941 (patch) | |
tree | 93b86efe4bf43cd44e4637c264d62d204d074227 /tests/auto/quick/qquickgridview | |
parent | add9da7811aca90febf90555f4c18e5d84ab7eec (diff) |
Don't override "z" bindings for header and footer
Headers and footers are given a default z value. This value
should be set between Component beginCreate() and completeCreate()
to avoid overwriting any binding in the header or footer item
that has already set the 'z' value.
Change-Id: I8e3ee97232d99500a32f2d77d2b663016eb404f7
Reviewed-by: Martin Jones <martin.jones@nokia.com>
Diffstat (limited to 'tests/auto/quick/qquickgridview')
-rw-r--r-- | tests/auto/quick/qquickgridview/data/initialZValues.qml | 35 | ||||
-rw-r--r-- | tests/auto/quick/qquickgridview/tst_qquickgridview.cpp | 21 |
2 files changed, 56 insertions, 0 deletions
diff --git a/tests/auto/quick/qquickgridview/data/initialZValues.qml b/tests/auto/quick/qquickgridview/data/initialZValues.qml new file mode 100644 index 0000000000..9768b2c695 --- /dev/null +++ b/tests/auto/quick/qquickgridview/data/initialZValues.qml @@ -0,0 +1,35 @@ +import QtQuick 2.0 + +Rectangle { + width: 240 + height: 320 + + GridView { + id: grid + + property real initialZ: 342 + + anchors.fill: parent + objectName: "grid" + model: ListModel {} + + delegate: Text { + objectName: "wrapper" + font.pointSize: 20 + text: index + } + + 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 8dc7fda49a..828a10242b 100644 --- a/tests/auto/quick/qquickgridview/tst_qquickgridview.cpp +++ b/tests/auto/quick/qquickgridview/tst_qquickgridview.cpp @@ -118,6 +118,7 @@ private slots: void manualHighlight(); void footer(); void footer_data(); + void initialZValues(); void header(); void header_data(); void extents(); @@ -3265,6 +3266,26 @@ void tst_QQuickGridView::footer_data() << QPointF(-(6 * 80) - 40, -320); } +void tst_QQuickGridView::initialZValues() +{ + QQuickView *canvas = createView(); + canvas->setSource(testFileUrl("initialZValues.qml")); + qApp->processEvents(); + + QQuickGridView *gridview = findItem<QQuickGridView>(canvas->rootObject(), "grid"); + QTRY_VERIFY(gridview != 0); + QQuickItem *contentItem = gridview->contentItem(); + QTRY_VERIFY(contentItem != 0); + + QVERIFY(gridview->headerItem()); + QTRY_COMPARE(gridview->headerItem()->z(), gridview->property("initialZ").toReal()); + + QVERIFY(gridview->footerItem()); + QTRY_COMPARE(gridview->footerItem()->z(), gridview->property("initialZ").toReal()); + + delete canvas; +} + void tst_QQuickGridView::header() { QFETCH(QQuickGridView::Flow, flow); |