diff options
author | Martin Jones <martin.jones@nokia.com> | 2010-07-14 05:32:32 (GMT) |
---|---|---|
committer | Martin Jones <martin.jones@nokia.com> | 2010-07-14 05:32:32 (GMT) |
commit | 9adc85fdfa0af2b6948408932188ee1b79247fa6 (patch) | |
tree | 42e472c72c1cd4a51383ff948e16eec970ae625f /src/declarative | |
parent | 7bd9e6c5805ab78c68161bec20c225965ea59ddb (diff) | |
download | Qt-9adc85fdfa0af2b6948408932188ee1b79247fa6.zip Qt-9adc85fdfa0af2b6948408932188ee1b79247fa6.tar.gz Qt-9adc85fdfa0af2b6948408932188ee1b79247fa6.tar.bz2 |
Position GridView and ListView footer correctly when model cleared.
Task-number: QTBUG-12167
Diffstat (limited to 'src/declarative')
-rw-r--r-- | src/declarative/graphicsitems/qdeclarativegridview.cpp | 5 | ||||
-rw-r--r-- | src/declarative/graphicsitems/qdeclarativelistview.cpp | 7 |
2 files changed, 9 insertions, 3 deletions
diff --git a/src/declarative/graphicsitems/qdeclarativegridview.cpp b/src/declarative/graphicsitems/qdeclarativegridview.cpp index dce6f0e..14a4f08 100644 --- a/src/declarative/graphicsitems/qdeclarativegridview.cpp +++ b/src/declarative/graphicsitems/qdeclarativegridview.cpp @@ -2438,8 +2438,11 @@ void QDeclarativeGridView::itemsRemoved(int modelIndex, int count) if (removedVisible && d->visibleItems.isEmpty()) { d->timeline.clear(); d->setPosition(0); - if (d->itemCount == 0) + if (d->itemCount == 0) { + d->updateHeader(); + d->updateFooter(); update(); + } } emit countChanged(); diff --git a/src/declarative/graphicsitems/qdeclarativelistview.cpp b/src/declarative/graphicsitems/qdeclarativelistview.cpp index cd26472..110c970 100644 --- a/src/declarative/graphicsitems/qdeclarativelistview.cpp +++ b/src/declarative/graphicsitems/qdeclarativelistview.cpp @@ -1077,7 +1077,7 @@ void QDeclarativeListViewPrivate::updateFooter() } if (footer) { if (visibleItems.count()) { - qreal endPos = endPosition(); + qreal endPos = endPosition() + 1; if (lastVisibleIndex() == model->count()-1) { footer->setPosition(endPos); } else { @@ -2893,8 +2893,11 @@ void QDeclarativeListView::itemsRemoved(int modelIndex, int count) d->visiblePos = d->header ? d->header->size() : 0; d->timeline.clear(); d->setPosition(0); - if (d->itemCount == 0) + if (d->itemCount == 0) { + d->updateHeader(); + d->updateFooter(); update(); + } } emit countChanged(); |