diff options
| author | Aaron Kennedy <aaron.kennedy@nokia.com> | 2010-06-03 01:38:28 (GMT) |
|---|---|---|
| committer | Aaron Kennedy <aaron.kennedy@nokia.com> | 2010-06-03 01:38:28 (GMT) |
| commit | 0c9149fef864b491d66c845d174bb1b8272fbd3a (patch) | |
| tree | 69006286649dca79ca374d31195b8fcd5505f021 /src/declarative | |
| parent | a0ebaa90465ffea92ce4a6c54cb03693fda747a2 (diff) | |
| parent | fe128b272c11ea2c826c850328c8bc80b8ac0028 (diff) | |
| download | Qt-0c9149fef864b491d66c845d174bb1b8272fbd3a.zip Qt-0c9149fef864b491d66c845d174bb1b8272fbd3a.tar.gz Qt-0c9149fef864b491d66c845d174bb1b8272fbd3a.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7
Diffstat (limited to 'src/declarative')
| -rw-r--r-- | src/declarative/graphicsitems/qdeclarativelistview.cpp | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/declarative/graphicsitems/qdeclarativelistview.cpp b/src/declarative/graphicsitems/qdeclarativelistview.cpp index 023d663..dbd1976 100644 --- a/src/declarative/graphicsitems/qdeclarativelistview.cpp +++ b/src/declarative/graphicsitems/qdeclarativelistview.cpp @@ -427,6 +427,8 @@ public: scheduleLayout(); } } + if (currentItem && currentItem->item == item) + updateHighlight(); if (trackedItem && trackedItem->item == item) q->trackedPositionChanged(); } @@ -1103,7 +1105,9 @@ void QDeclarativeListViewPrivate::updateHeader() void QDeclarativeListViewPrivate::fixupPosition() { - moveReason = Other; + if ((haveHighlightRange && highlightRange == QDeclarativeListView::StrictlyEnforceRange) + || snapMode != QDeclarativeListView::NoSnap) + moveReason = Other; if (orient == QDeclarativeListView::Vertical) fixupY(); else |