summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Brasser <michael.brasser@nokia.com>2009-12-14 02:39:09 (GMT)
committerMichael Brasser <michael.brasser@nokia.com>2009-12-14 02:43:51 (GMT)
commitc71d7b264cb55bb444cea90e1efa82f0243f566d (patch)
tree952aa6cf937846baae47aa0b3d54a9b0dd19c64d
parent167578b865bf53a88ff699a67bce0f17912807d5 (diff)
downloadQt-c71d7b264cb55bb444cea90e1efa82f0243f566d.zip
Qt-c71d7b264cb55bb444cea90e1efa82f0243f566d.tar.gz
Qt-c71d7b264cb55bb444cea90e1efa82f0243f566d.tar.bz2
Don't explicitly set z-value for the highlight.
This allows the highlight to be placed either above or below the items.
-rw-r--r--src/declarative/graphicsitems/qmlgraphicsgridview.cpp1
-rw-r--r--src/declarative/graphicsitems/qmlgraphicslistview.cpp1
2 files changed, 0 insertions, 2 deletions
diff --git a/src/declarative/graphicsitems/qmlgraphicsgridview.cpp b/src/declarative/graphicsitems/qmlgraphicsgridview.cpp
index fb40b35..c75c80c 100644
--- a/src/declarative/graphicsitems/qmlgraphicsgridview.cpp
+++ b/src/declarative/graphicsitems/qmlgraphicsgridview.cpp
@@ -628,7 +628,6 @@ void QmlGraphicsGridViewPrivate::createHighlight()
item->setParent(q->viewport());
}
if (item) {
- item->setZValue(0);
item->setParent(q->viewport());
highlight = new FxGridItem(item, q);
highlightXAnimator = new QmlEaseFollow(q);
diff --git a/src/declarative/graphicsitems/qmlgraphicslistview.cpp b/src/declarative/graphicsitems/qmlgraphicslistview.cpp
index a49794c..cdb3c49 100644
--- a/src/declarative/graphicsitems/qmlgraphicslistview.cpp
+++ b/src/declarative/graphicsitems/qmlgraphicslistview.cpp
@@ -762,7 +762,6 @@ void QmlGraphicsListViewPrivate::createHighlight()
}
if (item) {
item->setParent(q->viewport());
- item->setZValue(0);
highlight = new FxListItem(item, q);
if (orient == QmlGraphicsListView::Vertical)
highlight->item->setHeight(currentItem->item->height());