Fix filtering issue

When filtering items it might be possible that the update of
the widgets is wrong although the model internally has a correct
state.

BUG: 297269
FIXED-IN: 4.8.3

diff --git a/src/kitemviews/kitemlistview.cpp b/src/kitemviews/kitemlistview.cpp
index ddc65c3871ce7e803532520e5d3765039251670f..89c3cbaa60fc3b5bab57e9c526740fc4553cc86b 100644 (file)
--- a/src/kitemviews/kitemlistview.cpp
+++ b/src/kitemviews/kitemlistview.cpp
@@ -614,7 +614,7 @@ void KItemListView::setHeaderVisible(bool visible)
         const QSize headerSize = style()->sizeFromContents(QStyle::CT_HeaderSection,
                                                            &option, QSize());
 
-        m_headerWidget->setPos(0, 0);        
+        m_headerWidget->setPos(0, 0);
         m_headerWidget->resize(size().width(), headerSize.height());
         m_headerWidget->setModel(m_model);
         m_headerWidget->setColumns(m_visibleRoles);
@@ -927,8 +927,13 @@ void KItemListView::slotItemsRemoved(const KItemRangeList& itemRanges)
 
     m_layouter->markAsDirty();
 
+    int removedItemsCount = 0;
+    for (int i = 0; i < itemRanges.count(); ++i) {
+        removedItemsCount += itemRanges[i].count;
+    }
+
     for (int i = itemRanges.count() - 1; i >= 0; --i) {
-        const KItemRange& range = itemRanges.at(i);
+        const KItemRange& range = itemRanges[i];
         const int index = range.index;
         const int count = range.count;
         if (index < 0 || count <= 0) {
@@ -940,7 +945,8 @@ void KItemListView::slotItemsRemoved(const KItemRangeList& itemRanges)
 
         const int firstRemovedIndex = index;
         const int lastRemovedIndex = index + count - 1;
-        const int lastIndex = m_model->count() + count - 1;
+        const int lastIndex = m_model->count() -1 + removedItemsCount;
+        removedItemsCount -= count;
 
         // Remove all KItemListWidget instances that got deleted
         for (int i = firstRemovedIndex; i <= lastRemovedIndex; ++i) {