summaryrefslogtreecommitdiffstats
path: root/src/declarative/extra
diff options
context:
space:
mode:
authorLars Knoll <lars.knoll@nokia.com>2009-07-22 06:56:48 (GMT)
committerLars Knoll <lars.knoll@nokia.com>2009-07-22 06:56:48 (GMT)
commitd5f46ae26ee0cd4a3ccdde526f011b3bdd884abc (patch)
tree2212de57279175c39a1f1648bef57e2531443129 /src/declarative/extra
parent8dc527a3837c937630c8bbbab034b8bc84d496fb (diff)
downloadQt-d5f46ae26ee0cd4a3ccdde526f011b3bdd884abc.zip
Qt-d5f46ae26ee0cd4a3ccdde526f011b3bdd884abc.tar.gz
Qt-d5f46ae26ee0cd4a3ccdde526f011b3bdd884abc.tar.bz2
unify z-value handling in graphics and fx items.
Add a ItemNegativeZStacksBehindParent flag to QGraphicsItem to get the behavior we need in QFxItems. Removed the z property in QFxItems.
Diffstat (limited to 'src/declarative/extra')
-rw-r--r--src/declarative/extra/qfxflowview.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/declarative/extra/qfxflowview.cpp b/src/declarative/extra/qfxflowview.cpp
index 1676512..e1200c7 100644
--- a/src/declarative/extra/qfxflowview.cpp
+++ b/src/declarative/extra/qfxflowview.cpp
@@ -132,7 +132,7 @@ void QFxFlowView::refresh()
for (int ii = 0; ii < m_model->count(); ++ii) {
if (QFxItem *item = m_model->item(ii)) {
item->setParent(this);
- item->setZ(0);
+ item->setZValue(0);
m_items << item;
}
}
@@ -296,7 +296,7 @@ void QFxFlowView::mousePressEvent(QGraphicsSceneMouseEvent *event)
if (r.contains(event->pos())) {
m_dragItem = item;
- m_dragItem->setZ(1);
+ m_dragItem->setZValue(1);
m_dragOffset = r.topLeft() - event->pos();
event->accept();
return;
@@ -316,7 +316,7 @@ void QFxFlowView::mouseReleaseEvent(QGraphicsSceneMouseEvent *event)
{
Q_UNUSED(event);
if (m_dragItem) {
- m_dragItem->setZ(0);
+ m_dragItem->setZValue(0);
clearTimeLine();