diff options
author | Martin Jones <martin.jones@nokia.com> | 2012-03-12 17:55:38 +1000 |
---|---|---|
committer | Qt by Nokia <qt-info@nokia.com> | 2012-03-13 02:02:49 +0100 |
commit | a4d22cbb388f0d304f68997b4e071b88f93fdbdf (patch) | |
tree | ebedf0b22d592758e646896999c690b5d410fd34 /src/quick/items/qquickitemview.cpp | |
parent | c71db2cf825086e6de0735cfea19c5c7e851def4 (diff) |
ListView.contentHeight does not include header and footer item heights
Task-number: QTBUG-24664
Change-Id: I2a2fe144835e61665b8693d58ca4fb9ba506e8a8
Reviewed-by: Bea Lam <bea.lam@nokia.com>
Diffstat (limited to 'src/quick/items/qquickitemview.cpp')
-rw-r--r-- | src/quick/items/qquickitemview.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/quick/items/qquickitemview.cpp b/src/quick/items/qquickitemview.cpp index c6f45aaf0b..501b206ef6 100644 --- a/src/quick/items/qquickitemview.cpp +++ b/src/quick/items/qquickitemview.cpp @@ -1658,10 +1658,11 @@ void QQuickItemViewPrivate::updateViewport() { Q_Q(QQuickItemView); if (isValid()) { + qreal extra = headerSize() + footerSize(); if (layoutOrientation() == Qt::Vertical) - q->setContentHeight(endPosition() - startPosition()); + q->setContentHeight(endPosition() - startPosition() + extra); else - q->setContentWidth(endPosition() - startPosition()); + q->setContentWidth(endPosition() - startPosition() + extra); } } |