diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-03-01 03:04:57 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-03-01 03:04:57 (GMT) |
| commit | 6174f91cc2a8a53c14d3b2f4eccc62f9170699c8 (patch) | |
| tree | 08894dba6347764083f4fa9d73baed9486e2a986 | |
| parent | 1dca379031381eb7bff91970aec8056f1b7f2efb (diff) | |
| parent | 47201b118179d6585d8eac8ab27f756010024a23 (diff) | |
| download | Qt-6174f91cc2a8a53c14d3b2f4eccc62f9170699c8.zip Qt-6174f91cc2a8a53c14d3b2f4eccc62f9170699c8.tar.gz Qt-6174f91cc2a8a53c14d3b2f4eccc62f9170699c8.tar.bz2 | |
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml into master-integration
* 'master' of scm.dev.nokia.troll.no:qt/qt-qml:
Add mention of highlightRangeMode in snapMode docs.
Fix position of image in detail view.
| -rw-r--r-- | demos/declarative/flickr/common/ImageDetails.qml | 4 | ||||
| -rw-r--r-- | src/declarative/graphicsitems/qdeclarativelistview.cpp | 6 |
2 files changed, 7 insertions, 3 deletions
diff --git a/demos/declarative/flickr/common/ImageDetails.qml b/demos/declarative/flickr/common/ImageDetails.qml index f91b365..9604f10 100644 --- a/demos/declarative/flickr/common/ImageDetails.qml +++ b/demos/declarative/flickr/common/ImageDetails.qml @@ -93,9 +93,7 @@ Flipable { Image { id: bigImage; source: container.photoUrl; scale: slider.value - // Center image if it is smaller than the flickable area. - x: imageContainer.width > width*scale ? (imageContainer.width - width*scale) / 2 : 0 - y: imageContainer.height > height*scale ? (imageContainer.height - height*scale) / 2 : 0 + anchors.centerIn: parent; smooth: !flick.moving onStatusChanged : { // Default scale shows the entire image. diff --git a/src/declarative/graphicsitems/qdeclarativelistview.cpp b/src/declarative/graphicsitems/qdeclarativelistview.cpp index c496c97..e2cef23 100644 --- a/src/declarative/graphicsitems/qdeclarativelistview.cpp +++ b/src/declarative/graphicsitems/qdeclarativelistview.cpp @@ -1980,6 +1980,12 @@ void QDeclarativeListView::setHighlightResizeSpeed(qreal speed) visible item at the time the mouse button is released. This mode is particularly useful for moving one page at a time. \endlist + + snapMode does not affect the currentIndex. To update the + currentIndex as the list is moved set \e highlightRangeMode + to \e StrictlyEnforceRange. + + \sa highlightRangeMode */ QDeclarativeListView::SnapMode QDeclarativeListView::snapMode() const { |