diff options
| author | Martin Jones <martin.jones@nokia.com> | 2010-10-08 01:26:57 (GMT) |
|---|---|---|
| committer | Martin Jones <martin.jones@nokia.com> | 2010-10-08 01:26:57 (GMT) |
| commit | a5b0d58bbba508d708b2711124c61a74e3b4f310 (patch) | |
| tree | 01291de184f18a9ee1c1f9bf8bdfe952e1feaebe | |
| parent | 33245164dc62d27f88a8914d1112f3a4155fa174 (diff) | |
| download | Qt-a5b0d58bbba508d708b2711124c61a74e3b4f310.zip Qt-a5b0d58bbba508d708b2711124c61a74e3b4f310.tar.gz Qt-a5b0d58bbba508d708b2711124c61a74e3b4f310.tar.bz2 | |
Ensure Flickable.contentX and Flickable.contentY return correct values.
The animation value was used previously, but this isn't the actual
position of the contentItem.
Task-number: QTBUG-13603
Reviewed-by: Michael Brasser
| -rw-r--r-- | src/declarative/graphicsitems/qdeclarativeflickable.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/declarative/graphicsitems/qdeclarativeflickable.cpp b/src/declarative/graphicsitems/qdeclarativeflickable.cpp index 33c21b1..001abca 100644 --- a/src/declarative/graphicsitems/qdeclarativeflickable.cpp +++ b/src/declarative/graphicsitems/qdeclarativeflickable.cpp @@ -466,7 +466,7 @@ QDeclarativeFlickable::~QDeclarativeFlickable() qreal QDeclarativeFlickable::contentX() const { Q_D(const QDeclarativeFlickable); - return -d->hData.move.value(); + return -d->contentItem->x(); } void QDeclarativeFlickable::setContentX(qreal pos) @@ -484,7 +484,7 @@ void QDeclarativeFlickable::setContentX(qreal pos) qreal QDeclarativeFlickable::contentY() const { Q_D(const QDeclarativeFlickable); - return -d->vData.move.value(); + return -d->contentItem->y(); } void QDeclarativeFlickable::setContentY(qreal pos) |