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 /src/quick/items/qquickitemview.cpp | |
| 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 'src/quick/items/qquickitemview.cpp')
| -rw-r--r-- | src/quick/items/qquickitemview.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/quick/items/qquickitemview.cpp b/src/quick/items/qquickitemview.cpp index e51a562490..9685834578 100644 --- a/src/quick/items/qquickitemview.cpp +++ b/src/quick/items/qquickitemview.cpp @@ -2318,7 +2318,8 @@ void QQuickItemView::initItem(int, QObject *object) { QQuickItem* item = qmlobject_cast<QQuickItem*>(object); if (item) { - item->setZ(1); + if (qFuzzyIsNull(item->z())) + item->setZ(1); item->setParentItem(contentItem()); QQuickItemPrivate::get(item)->setCulled(true); } @@ -2382,7 +2383,8 @@ QQuickItem *QQuickItemViewPrivate::createComponentItem(QQmlComponent *component, item = new QQuickItem; } if (item) { - item->setZ(zValue); + if (qFuzzyIsNull(item->z())) + item->setZ(zValue); QQml_setParent_noEvent(item, q->contentItem()); item->setParentItem(q->contentItem()); } |