diff options
author | Sergio Ahumada <sergio.ahumada@digia.com> | 2013-08-06 16:07:23 +0200 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-08-06 18:26:47 +0200 |
commit | f1b9ba8c6ee6b991ef4e513bc4f39045fd55d1e6 (patch) | |
tree | cd587156a07344e98aca0cd1511075fe272bfec5 /src/quick/items/qquickflickable.cpp | |
parent | 27deff6d2b5a9eb1d98cd7b377ab934a35086664 (diff) | |
parent | 1d3b9db5b54d8ae99c6b149c8d3d91eda19b5838 (diff) |
Merge "Merge branch 'stable' into dev" into refs/staging/dev
Diffstat (limited to 'src/quick/items/qquickflickable.cpp')
-rw-r--r-- | src/quick/items/qquickflickable.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/quick/items/qquickflickable.cpp b/src/quick/items/qquickflickable.cpp index 75d509129b..f77c427ccf 100644 --- a/src/quick/items/qquickflickable.cpp +++ b/src/quick/items/qquickflickable.cpp @@ -882,8 +882,10 @@ QQuickItem *QQuickFlickable::contentItem() QQuickFlickableVisibleArea *QQuickFlickable::visibleArea() { Q_D(QQuickFlickable); - if (!d->visibleArea) + if (!d->visibleArea) { d->visibleArea = new QQuickFlickableVisibleArea(this); + d->visibleArea->updateVisible(); // calculate initial ratios + } return d->visibleArea; } @@ -1519,8 +1521,7 @@ void QQuickFlickable::geometryChanged(const QRectF &newGeometry, bool changed = false; if (newGeometry.width() != oldGeometry.width()) { - if (xflick()) - changed = true; + changed = true; // we must update visualArea.widthRatio if (d->hData.viewSize < 0) { d->contentItem->setWidth(width()); emit contentWidthChanged(); @@ -1532,8 +1533,7 @@ void QQuickFlickable::geometryChanged(const QRectF &newGeometry, } } if (newGeometry.height() != oldGeometry.height()) { - if (yflick()) - changed = true; + changed = true; // we must update visualArea.heightRatio if (d->vData.viewSize < 0) { d->contentItem->setHeight(height()); emit contentHeightChanged(); |