summaryrefslogtreecommitdiffstats
path: root/src/declarative/graphicsitems/qdeclarativeflickable.cpp
diff options
context:
space:
mode:
authorMartin Jones <martin.jones@nokia.com>2010-08-31 02:38:12 (GMT)
committerMartin Jones <martin.jones@nokia.com>2010-08-31 02:38:12 (GMT)
commitcfc3564328c9545a9eed4aca02f99dac5e0e4390 (patch)
tree93e8337a555e343b281b62994b6848b4e564fbb4 /src/declarative/graphicsitems/qdeclarativeflickable.cpp
parentd01313b94e1eb8f8b9aa088433118459b588a79f (diff)
downloadQt-cfc3564328c9545a9eed4aca02f99dac5e0e4390.zip
Qt-cfc3564328c9545a9eed4aca02f99dac5e0e4390.tar.gz
Qt-cfc3564328c9545a9eed4aca02f99dac5e0e4390.tar.bz2
Ensure Flickable visibleArea is updated when view height changes
Task-number: QTBUG-13095
Diffstat (limited to 'src/declarative/graphicsitems/qdeclarativeflickable.cpp')
-rw-r--r--src/declarative/graphicsitems/qdeclarativeflickable.cpp4
1 files changed, 4 insertions, 0 deletions
diff --git a/src/declarative/graphicsitems/qdeclarativeflickable.cpp b/src/declarative/graphicsitems/qdeclarativeflickable.cpp
index a710190..63a2a77 100644
--- a/src/declarative/graphicsitems/qdeclarativeflickable.cpp
+++ b/src/declarative/graphicsitems/qdeclarativeflickable.cpp
@@ -1001,12 +1001,16 @@ void QDeclarativeFlickable::geometryChanged(const QRectF &newGeometry,
bool changed = false;
if (newGeometry.width() != oldGeometry.width()) {
+ if (xflick())
+ changed = true;
if (d->hData.viewSize < 0) {
d->contentItem->setWidth(width());
emit contentWidthChanged();
}
}
if (newGeometry.height() != oldGeometry.height()) {
+ if (yflick())
+ changed = true;
if (d->vData.viewSize < 0) {
d->contentItem->setHeight(height());
emit contentHeightChanged();