diff options
| author | Martin Jones <martin.jones@nokia.com> | 2012-05-30 12:58:04 +1000 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-05-31 02:23:04 +0200 |
| commit | 47204d2cc9d2bdb85aab869fcc5307d7c09df12c (patch) | |
| tree | c24bd57df700e8c55d618a6b7afbf70352f19bbd /src/quick/items/qquickitemview.cpp | |
| parent | fdbb1f1b4f43a961d66998a1125f5e11618ed025 (diff) | |
Clearing a view didn't reset content size.
Ensure that a valid contentHeight/contentWidth is set regardless
of whether there is a valid model.
Change-Id: I546683c7571a1379e3ca2ef285435ad48319e8e4
Reviewed-by: Bea Lam <bea.lam@nokia.com>
Diffstat (limited to 'src/quick/items/qquickitemview.cpp')
| -rw-r--r-- | src/quick/items/qquickitemview.cpp | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/src/quick/items/qquickitemview.cpp b/src/quick/items/qquickitemview.cpp index f7b28e1455..1774931e68 100644 --- a/src/quick/items/qquickitemview.cpp +++ b/src/quick/items/qquickitemview.cpp @@ -1714,13 +1714,12 @@ void QQuickItemViewPrivate::regenerate() void QQuickItemViewPrivate::updateViewport() { Q_Q(QQuickItemView); - if (isValid()) { - qreal extra = headerSize() + footerSize(); - if (layoutOrientation() == Qt::Vertical) - q->setContentHeight(endPosition() - startPosition() + extra); - else - q->setContentWidth(endPosition() - startPosition() + extra); - } + qreal extra = headerSize() + footerSize(); + qreal contentSize = isValid() ? (endPosition() - startPosition()) : 0.0; + if (layoutOrientation() == Qt::Vertical) + q->setContentHeight(contentSize + extra); + else + q->setContentWidth(contentSize + extra); } void QQuickItemViewPrivate::layout() |