X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/blobdiff_plain/58ab93541c70de4fa7cbb90dc3423cfec556dc38..c8d8556950005dfd96ebdb41d2f43ad90356367c:/src/kitemviews/kitemlistselectionmanager.cpp

diff --git a/src/kitemviews/kitemlistselectionmanager.cpp b/src/kitemviews/kitemlistselectionmanager.cpp
index a03e8172c..79c3370b4 100644
--- a/src/kitemviews/kitemlistselectionmanager.cpp
+++ b/src/kitemviews/kitemlistselectionmanager.cpp
@@ -81,11 +81,13 @@ QSet<int> KItemListSelectionManager::selectedItems() const
 {
     QSet<int> selectedItems = m_selectedItems;
 
-    if (m_isAnchoredSelectionActive && (m_anchorItem != m_currentItem)) {
+    if (m_isAnchoredSelectionActive && m_anchorItem != m_currentItem) {
+        Q_ASSERT(m_anchorItem >= 0);
+        Q_ASSERT(m_currentItem >= 0);
         const int from = qMin(m_anchorItem, m_currentItem);
         const int to = qMax(m_anchorItem, m_currentItem);
 
-        for (int index = from; index <= to; index++) {
+        for (int index = from; index <= to; ++index) {
             selectedItems.insert(index);
         }
     }
@@ -93,9 +95,29 @@ QSet<int> KItemListSelectionManager::selectedItems() const
     return selectedItems;
 }
 
+bool KItemListSelectionManager::isSelected(int index) const
+{
+    if (m_selectedItems.contains(index)) {
+        return true;
+    }
+
+    if (m_isAnchoredSelectionActive && m_anchorItem != m_currentItem) {
+        Q_ASSERT(m_anchorItem >= 0);
+        Q_ASSERT(m_currentItem >= 0);
+        const int from = qMin(m_anchorItem, m_currentItem);
+        const int to = qMax(m_anchorItem, m_currentItem);
+
+        if (from <= index && index <= to) {
+            return true;
+        }
+    }
+
+    return false;
+}
+
 bool KItemListSelectionManager::hasSelection() const
 {
-    return !m_selectedItems.isEmpty() || (m_isAnchoredSelectionActive && (m_anchorItem != m_currentItem));
+    return !m_selectedItems.isEmpty() || (m_isAnchoredSelectionActive && m_anchorItem != m_currentItem);
 }
 
 void KItemListSelectionManager::setSelected(int index, int count, SelectionMode mode)
@@ -104,6 +126,7 @@ void KItemListSelectionManager::setSelected(int index, int count, SelectionMode
         return;
     }
 
+    endAnchoredSelection();
     const QSet<int> previous = selectedItems();
 
     count = qMin(count, m_model->count() - index);
@@ -155,17 +178,21 @@ void KItemListSelectionManager::clearSelection()
 
 void KItemListSelectionManager::beginAnchoredSelection(int anchor)
 {
-    m_isAnchoredSelectionActive = true;
-    setAnchorItem(anchor);
+    if (anchor >= 0 && m_model && anchor < m_model->count()) {
+        m_isAnchoredSelectionActive = true;
+        m_anchorItem = anchor;
+    }
 }
 
 void KItemListSelectionManager::endAnchoredSelection()
 {
     if (m_isAnchoredSelectionActive && (m_anchorItem != m_currentItem)) {
+        Q_ASSERT(m_anchorItem >= 0);
+        Q_ASSERT(m_currentItem >= 0);
         const int from = qMin(m_anchorItem, m_currentItem);
         const int to = qMax(m_anchorItem, m_currentItem);
 
-        for (int index = from; index <= to; index++) {
+        for (int index = from; index <= to; ++index) {
             m_selectedItems.insert(index);
         }
     }
@@ -173,35 +200,11 @@ void KItemListSelectionManager::endAnchoredSelection()
     m_isAnchoredSelectionActive = false;
 }
 
-void KItemListSelectionManager::setAnchorItem(int anchor)
-{
-    const int previous = m_anchorItem;
-    if (m_model && anchor < m_model->count()) {
-        m_anchorItem = anchor;
-    } else {
-        m_anchorItem = -1;
-    }
-
-    if (m_anchorItem != previous) {
-        emit anchorChanged(m_anchorItem, previous);
-    }
-}
-
-int KItemListSelectionManager::anchorItem() const
-{
-    return m_anchorItem;
-}
-
 bool KItemListSelectionManager::isAnchoredSelectionActive() const
 {
     return m_isAnchoredSelectionActive;
 }
 
-void KItemListSelectionManager::setAnchoredSelectionActive(bool active)
-{
-    m_isAnchoredSelectionActive = active;
-}
-
 KItemModelBase* KItemListSelectionManager::model() const
 {
     return m_model;
@@ -240,9 +243,8 @@ void KItemListSelectionManager::itemsInserted(const KItemRangeList& itemRanges)
 
     // Update the anchor item
     if (m_anchorItem < 0) {
-        setAnchorItem(0);
+        m_anchorItem = 0;
     } else {
-        const int previousAnchor = m_anchorItem;
         int inc = 0;
         foreach (const KItemRange& itemRange, itemRanges) {
             if (m_anchorItem < itemRange.index) {
@@ -251,13 +253,13 @@ void KItemListSelectionManager::itemsInserted(const KItemRangeList& itemRanges)
             inc += itemRange.count;
         }
         m_anchorItem += inc;
-        emit anchorChanged(m_anchorItem, previousAnchor);
     }
 
     // Update the selections
     if (!m_selectedItems.isEmpty()) {
         const QSet<int> previous = m_selectedItems;
         m_selectedItems.clear();
+        m_selectedItems.reserve(previous.count());
         QSetIterator<int> it(previous);
         while (it.hasNext()) {
             const int index = it.next();
@@ -286,65 +288,81 @@ void KItemListSelectionManager::itemsRemoved(const KItemRangeList& itemRanges)
     // Update the current item
     if (m_currentItem >= 0) {
         const int previousCurrent = m_currentItem;
-        int currentItem = m_currentItem;
-        foreach (const KItemRange& itemRange, itemRanges) {
-            if (currentItem < itemRange.index) {
-                break;
-            }
-            if (currentItem >= itemRange.index + itemRange.count) {
-                currentItem -= itemRange.count;
-            } else if (currentItem >= m_model->count()) {
-                currentItem = m_model->count() - 1;
-            }
-        }
-        // Calling setCurrentItem would trigger the selectionChanged signal, but we want to
+        // Calling setCurrentItem() would trigger the selectionChanged signal, but we want to
         // emit it only once in this function -> change the current item manually and emit currentChanged
-        m_currentItem = currentItem;
-        emit currentChanged(m_currentItem, previousCurrent);
+        m_currentItem = indexAfterRangesRemoving(m_currentItem, itemRanges);
+        if (m_currentItem < 0) {
+            m_currentItem = qMin(previousCurrent, m_model->count() - 1);
+        }
+        if (m_currentItem != previousCurrent) {
+            emit currentChanged(m_currentItem, previousCurrent);
+        }
     }
 
     // Update the anchor item
     if (m_anchorItem >= 0) {
-        const int previousAnchor = m_anchorItem;
-        int anchorItem = m_anchorItem;
-        foreach (const KItemRange& itemRange, itemRanges) {
-            if (anchorItem < itemRange.index) {
-                break;
-            }
-            if (anchorItem >= itemRange.index + itemRange.count) {
-                anchorItem -= itemRange.count;
-            } else if (anchorItem >= m_model->count()) {
-                anchorItem = m_model->count() - 1;
-            }
+        m_anchorItem = indexAfterRangesRemoving(m_anchorItem, itemRanges);
+        if (m_anchorItem < 0) {
+            m_isAnchoredSelectionActive = false;
         }
-        m_anchorItem = anchorItem;
-        emit anchorChanged(m_anchorItem, previousAnchor);
     }
 
-    // Update the selections
+    // Update the selections and the anchor item
     if (!m_selectedItems.isEmpty()) {
         const QSet<int> previous = m_selectedItems;
         m_selectedItems.clear();
+        m_selectedItems.reserve(previous.count());
         QSetIterator<int> it(previous);
         while (it.hasNext()) {
-            int index = it.next();
-            int dec = 0;
-            foreach (const KItemRange& itemRange, itemRanges) {
-                if (index < itemRange.index) {
-                    break;
-                }
+            const int index = indexAfterRangesRemoving(it.next(), itemRanges);
+            if (index >= 0)  {
+                m_selectedItems.insert(index);
+            }
+        }
+    }
 
-                if (index < itemRange.index + itemRange.count) {
-                    // The selection is part of the removed range
-                    // and will get deleted
-                    index = -1;
-                    break;
-                }
+    const QSet<int> selection = selectedItems();
+    if (selection != previousSelection) {
+        emit selectionChanged(selection, previousSelection);
+    }
+
+    Q_ASSERT(m_currentItem < m_model->count());
+    Q_ASSERT(m_anchorItem < m_model->count());
+}
 
-                dec += itemRange.count;
+void KItemListSelectionManager::itemsMoved(const KItemRange& itemRange, const QList<int>& movedToIndexes)
+{
+    // Store the current selection (needed in the selectionChanged() signal)
+    const QSet<int> previousSelection = selectedItems();
+
+    // Update the current item
+    if (m_currentItem >= itemRange.index && m_currentItem < itemRange.index + itemRange.count) {
+        const int previousCurrentItem = m_currentItem;
+        const int newCurrentItem = movedToIndexes.at(previousCurrentItem - itemRange.index);
+
+        // Calling setCurrentItem would trigger the selectionChanged signal, but we want to
+        // emit it only once in this function -> change the current item manually and emit currentChanged
+        m_currentItem = newCurrentItem;
+        emit currentChanged(newCurrentItem, previousCurrentItem);
+    }
+
+    // Update the anchor item
+    if (m_anchorItem >= itemRange.index && m_anchorItem < itemRange.index + itemRange.count) {
+        m_anchorItem = movedToIndexes.at(m_anchorItem - itemRange.index);
+    }
+
+    // Update the selections
+    if (!m_selectedItems.isEmpty()) {
+        const QSet<int> previous = m_selectedItems;
+        m_selectedItems.clear();
+        m_selectedItems.reserve(previous.count());
+        QSetIterator<int> it(previous);
+        while (it.hasNext()) {
+            const int index = it.next();
+            if (index >= itemRange.index && index < itemRange.index + itemRange.count) {
+                m_selectedItems.insert(movedToIndexes.at(index - itemRange.index));
             }
-            index -= dec;
-            if (index >= 0)  {
+            else {
                 m_selectedItems.insert(index);
             }
         }
@@ -356,4 +374,21 @@ void KItemListSelectionManager::itemsRemoved(const KItemRangeList& itemRanges)
     }
 }
 
+int KItemListSelectionManager::indexAfterRangesRemoving(int index, const KItemRangeList& itemRanges) const
+{
+    int dec = 0;
+    foreach (const KItemRange& itemRange, itemRanges) {
+        if (index < itemRange.index) {
+            break;
+        }
+
+        if (index < itemRange.index + itemRange.count) {
+            // The index is part of the removed range
+            return -1;
+        }
+
+        dec += itemRange.count;
+    }
+    return index - dec;
+}
 #include "kitemlistselectionmanager.moc"