Keep current item and selection when resorting, part 2

This commit adds the missing pieces to KItemListView and makes
KFileItemModel::resortAllItems() only emit the itemsMoved() signal.

1 files changed, 13 insertions, 2 deletions

diff --git a/src/kitemviews/kitemlistview.cpp b/src/kitemviews/kitemlistview.cpp
index 612b6fd65..4818527ba 100644
--- a/src/kitemviews/kitemlistview.cpp
+++ b/src/kitemviews/kitemlistview.cpp
@@ -771,8 +771,19 @@ void KItemListView::slotItemsMoved(const KItemRange& itemRange, const QList<int>
     // TODO:
     // * Implement KItemListView::slotItemsMoved() (which should call KItemListSelectionManager::itemsMoved())
     // * Do not emit itemsRemoved()/itemsInserted() in KFileItemModel::resortAllItems()
-    Q_UNUSED(itemRange);
-    Q_UNUSED(movedToIndexes);
+    const int firstVisibleMovedIndex = qMax(firstVisibleIndex(), itemRange.index);
+    const int lastVisibleMovedIndex = qMin(lastVisibleIndex(), itemRange.index + itemRange.count - 1);
+
+    for (int index = firstVisibleMovedIndex; index <= lastVisibleMovedIndex; ++index) {
+        KItemListWidget* widget = m_visibleItems.value(index);
+        if (widget) {
+            updateWidgetProperties(widget, index);
+        }
+    }
+
+    if (m_controller) {
+        m_controller->selectionManager()->itemsMoved(itemRange, movedToIndexes);
+    }
 }
 
 void KItemListView::slotItemsChanged(const KItemRangeList& itemRanges,