diff options
author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-04-01 16:06:23 (GMT) |
---|---|---|
committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-04-01 16:06:23 (GMT) |
commit | f707672eb4c51ea82fbd98e1da16ece61a74c690 (patch) | |
tree | f276d6ae14986b29cf29da411691b57d3dd47a89 /src/declarative/graphicsitems/qdeclarativeflickable.cpp | |
parent | 1c3fa677ee494f8982c99b468b4a4fcad8aa04c7 (diff) | |
parent | 14de8cecfa5b5428d597c9cca111ee0f3f89502f (diff) | |
download | Qt-f707672eb4c51ea82fbd98e1da16ece61a74c690.zip Qt-f707672eb4c51ea82fbd98e1da16ece61a74c690.tar.gz Qt-f707672eb4c51ea82fbd98e1da16ece61a74c690.tar.bz2 |
Merge branch 4.7 into qt-master-from-4.7
Diffstat (limited to 'src/declarative/graphicsitems/qdeclarativeflickable.cpp')
-rw-r--r-- | src/declarative/graphicsitems/qdeclarativeflickable.cpp | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/src/declarative/graphicsitems/qdeclarativeflickable.cpp b/src/declarative/graphicsitems/qdeclarativeflickable.cpp index f42e55a..566d025 100644 --- a/src/declarative/graphicsitems/qdeclarativeflickable.cpp +++ b/src/declarative/graphicsitems/qdeclarativeflickable.cpp @@ -1318,7 +1318,9 @@ void QDeclarativeFlickable::resizeContent(qreal w, qreal h, QPointF center) Q_D(QDeclarativeFlickable); if (w != d->hData.viewSize) { qreal oldSize = d->hData.viewSize; - setContentWidth(w); + d->hData.viewSize = w; + d->contentItem->setWidth(w); + emit contentWidthChanged(); if (center.x() != 0) { qreal pos = center.x() * w / oldSize; setContentX(contentX() + pos - center.x()); @@ -1326,12 +1328,15 @@ void QDeclarativeFlickable::resizeContent(qreal w, qreal h, QPointF center) } if (h != d->vData.viewSize) { qreal oldSize = d->vData.viewSize; - setContentHeight(h); + d->vData.viewSize = h; + d->contentItem->setHeight(h); + emit contentHeightChanged(); if (center.y() != 0) { qreal pos = center.y() * h / oldSize; setContentY(contentY() + pos - center.y()); } } + d->updateBeginningEnd(); } /*! |