diff options
| author | Bill King <bill.king@nokia.com> | 2010-02-08 01:05:50 (GMT) |
|---|---|---|
| committer | Bill King <bill.king@nokia.com> | 2010-02-08 01:05:50 (GMT) |
| commit | 699e74ff71502cbb5ddf973dea3308d42655a573 (patch) | |
| tree | 345e6c1542d42659cd8155d46d15c25f1462c165 | |
| parent | 159c582ccad4c3a29137f676f9e7fc97855d3aa6 (diff) | |
| parent | 0c409e0b6c9b251ae539c9e545dd2e425af22a46 (diff) | |
| download | Qt-699e74ff71502cbb5ddf973dea3308d42655a573.zip Qt-699e74ff71502cbb5ddf973dea3308d42655a573.tar.gz Qt-699e74ff71502cbb5ddf973dea3308d42655a573.tar.bz2 | |
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml
| -rw-r--r-- | src/declarative/graphicsitems/qmlgraphicsflickable.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/declarative/graphicsitems/qmlgraphicsflickable.cpp b/src/declarative/graphicsitems/qmlgraphicsflickable.cpp index c4edb28..2ff3b30 100644 --- a/src/declarative/graphicsitems/qmlgraphicsflickable.cpp +++ b/src/declarative/graphicsitems/qmlgraphicsflickable.cpp @@ -119,8 +119,8 @@ void QmlGraphicsFlickableVisibleArea::updateVisible() // Vertical const qreal viewheight = flickable->height(); - const qreal maxyextent = -flickable->maxYExtent(); - qreal pagePos = -p->_moveY.value() / (maxyextent + viewheight); + const qreal maxyextent = -flickable->maxYExtent() + flickable->minYExtent(); + qreal pagePos = (-p->_moveY.value() + flickable->minYExtent()) / (maxyextent + viewheight); qreal pageSize = viewheight / (maxyextent + viewheight); if (pageSize != m_heightRatio) { @@ -134,8 +134,8 @@ void QmlGraphicsFlickableVisibleArea::updateVisible() // Horizontal const qreal viewwidth = flickable->width(); - const qreal maxxextent = -flickable->maxXExtent(); - pagePos = -p->_moveX.value() / (maxxextent + viewwidth); + const qreal maxxextent = -flickable->maxXExtent() + flickable->minXExtent(); + pagePos = (-p->_moveX.value() + flickable->minXExtent()) / (maxxextent + viewwidth); pageSize = viewwidth / (maxxextent + viewwidth); if (pageSize != m_widthRatio) { @@ -322,7 +322,7 @@ void QmlGraphicsFlickablePrivate::updateBeginningEnd() // Vertical const int maxyextent = int(-q->maxYExtent()); const qreal ypos = -_moveY.value(); - bool atBeginning = (ypos <= 0.0); + bool atBeginning = (ypos <= -q->minYExtent()); bool atEnd = (maxyextent <= ypos); if (atBeginning != atYBeginning) { @@ -337,7 +337,7 @@ void QmlGraphicsFlickablePrivate::updateBeginningEnd() // Horizontal const int maxxextent = int(-q->maxXExtent()); const qreal xpos = -_moveX.value(); - atBeginning = (xpos <= 0.0); + atBeginning = (xpos <= -q->minXExtent()); atEnd = (maxxextent <= xpos); if (atBeginning != atXBeginning) { |