Correct searchbox, split view transitions between tabs

[dolphin.git] / src / kitemviews / kitemlistselectionmanager.cpp

diff --git a/src/kitemviews/kitemlistselectionmanager.cpp b/src/kitemviews/kitemlistselectionmanager.cpp
index 3c7b94965674ed5d1f392a9cfc1e14ff9bfa3861..46ffe7c139f036b840659ca49a3fb4ece3955664 100644 (file)
--- a/src/kitemviews/kitemlistselectionmanager.cpp
+++ b/src/kitemviews/kitemlistselectionmanager.cpp
@@ -24,7 +24,6 @@
 #include "kitemlistselectionmanager.h"
 
 #include "kitemmodelbase.h"
 #include "kitemlistselectionmanager.h"
 
 #include "kitemmodelbase.h"

-#include <KDebug>

 
 KItemListSelectionManager::KItemListSelectionManager(QObject* parent) :
     QObject(parent),
 
 KItemListSelectionManager::KItemListSelectionManager(QObject* parent) :
     QObject(parent),


@@ -43,7 +42,7 @@ KItemListSelectionManager::~KItemListSelectionManager()
 void KItemListSelectionManager::setCurrentItem(int current)
 {
     const int previous = m_currentItem;
 void KItemListSelectionManager::setCurrentItem(int current)
 {
     const int previous = m_currentItem;

-    const QSet<int> previousSelection = selectedItems();
+    const KItemSet previousSelection = selectedItems();

 
     if (m_model && current >= 0 && current < m_model->count()) {
         m_currentItem = current;
 
     if (m_model && current >= 0 && current < m_model->count()) {
         m_currentItem = current;


@@ -55,7 +54,7 @@ void KItemListSelectionManager::setCurrentItem(int current)
         emit currentChanged(m_currentItem, previous);
 
         if (m_isAnchoredSelectionActive) {
         emit currentChanged(m_currentItem, previous);
 
         if (m_isAnchoredSelectionActive) {

-            const QSet<int> selection = selectedItems();
+            const KItemSet selection = selectedItems();

             if (selection != previousSelection) {
                 emit selectionChanged(selection, previousSelection);
             }
             if (selection != previousSelection) {
                 emit selectionChanged(selection, previousSelection);
             }


@@ -68,18 +67,18 @@ int KItemListSelectionManager::currentItem() const
     return m_currentItem;
 }
 
     return m_currentItem;
 }
 

-void KItemListSelectionManager::setSelectedItems(const QSet<int>& items)
+void KItemListSelectionManager::setSelectedItems(const KItemSet& items)

 {
     if (m_selectedItems != items) {
 {
     if (m_selectedItems != items) {

-        const QSet<int> previous = m_selectedItems;
+        const KItemSet previous = m_selectedItems;

         m_selectedItems = items;
         emit selectionChanged(m_selectedItems, previous);
     }
 }
 
         m_selectedItems = items;
         emit selectionChanged(m_selectedItems, previous);
     }
 }
 

-QSet<int> KItemListSelectionManager::selectedItems() const
+KItemSet KItemListSelectionManager::selectedItems() const

 {
 {

-    QSet<int> selectedItems = m_selectedItems;
+    KItemSet selectedItems = m_selectedItems;

 
     if (m_isAnchoredSelectionActive && m_anchorItem != m_currentItem) {
         Q_ASSERT(m_anchorItem >= 0);
 
     if (m_isAnchoredSelectionActive && m_anchorItem != m_currentItem) {
         Q_ASSERT(m_anchorItem >= 0);


@@ -95,6 +94,26 @@ QSet<int> KItemListSelectionManager::selectedItems() const
     return selectedItems;
 }
 
     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);
 bool KItemListSelectionManager::hasSelection() const
 {
     return !m_selectedItems.isEmpty() || (m_isAnchoredSelectionActive && m_anchorItem != m_currentItem);


@@ -107,7 +126,7 @@ void KItemListSelectionManager::setSelected(int index, int count, SelectionMode
     }
 
     endAnchoredSelection();
     }
 
     endAnchoredSelection();

-    const QSet<int> previous = selectedItems();
+    const KItemSet previous = selectedItems();

 
     count = qMin(count, m_model->count() - index);
 
 
     count = qMin(count, m_model->count() - index);
 


@@ -140,7 +159,7 @@ void KItemListSelectionManager::setSelected(int index, int count, SelectionMode
         break;
     }
 
         break;
     }
 

-    const QSet<int> selection = selectedItems();
+    const KItemSet selection = selectedItems();

     if (selection != previous) {
         emit selectionChanged(selection, previous);
     }
     if (selection != previous) {
         emit selectionChanged(selection, previous);
     }


@@ -148,11 +167,11 @@ void KItemListSelectionManager::setSelected(int index, int count, SelectionMode
 
 void KItemListSelectionManager::clearSelection()
 {
 
 void KItemListSelectionManager::clearSelection()
 {

-    const QSet<int> previous = selectedItems();
+    const KItemSet previous = selectedItems();

     if (!previous.isEmpty()) {
         m_selectedItems.clear();
         m_isAnchoredSelectionActive = false;
     if (!previous.isEmpty()) {
         m_selectedItems.clear();
         m_isAnchoredSelectionActive = false;

-        emit selectionChanged(QSet<int>(), previous);
+        emit selectionChanged(KItemSet(), previous);

     }
 }
 
     }
 }
 


@@ -180,11 +199,6 @@ void KItemListSelectionManager::endAnchoredSelection()
     m_isAnchoredSelectionActive = false;
 }
 
     m_isAnchoredSelectionActive = false;
 }
 

-int KItemListSelectionManager::anchorItem() const
-{
-    return m_anchorItem;
-}
-

 bool KItemListSelectionManager::isAnchoredSelectionActive() const
 {
     return m_isAnchoredSelectionActive;
 bool KItemListSelectionManager::isAnchoredSelectionActive() const
 {
     return m_isAnchoredSelectionActive;


@@ -206,7 +220,7 @@ void KItemListSelectionManager::setModel(KItemModelBase* model)
 void KItemListSelectionManager::itemsInserted(const KItemRangeList& itemRanges)
 {
     // Store the current selection (needed in the selectionChanged() signal)
 void KItemListSelectionManager::itemsInserted(const KItemRangeList& itemRanges)
 {
     // Store the current selection (needed in the selectionChanged() signal)

-    const QSet<int> previousSelection = selectedItems();
+    const KItemSet previousSelection = selectedItems();

 
     // Update the current item
     if (m_currentItem < 0) {
 
     // Update the current item
     if (m_currentItem < 0) {


@@ -242,11 +256,10 @@ void KItemListSelectionManager::itemsInserted(const KItemRangeList& itemRanges)
 
     // Update the selections
     if (!m_selectedItems.isEmpty()) {
 
     // Update the selections
     if (!m_selectedItems.isEmpty()) {

-        const QSet<int> previous = m_selectedItems;
+        const KItemSet previous = m_selectedItems;

         m_selectedItems.clear();
         m_selectedItems.clear();

-        QSetIterator<int> it(previous);
-        while (it.hasNext()) {
-            const int index = it.next();
+
+        for (int index: previous) {

             int inc = 0;
             foreach (const KItemRange& itemRange, itemRanges) {
                 if (index < itemRange.index) {
             int inc = 0;
             foreach (const KItemRange& itemRange, itemRanges) {
                 if (index < itemRange.index) {


@@ -258,7 +271,7 @@ void KItemListSelectionManager::itemsInserted(const KItemRangeList& itemRanges)
         }
     }
 
         }
     }
 

-    const QSet<int> selection = selectedItems();
+    const KItemSet selection = selectedItems();

     if (selection != previousSelection) {
         emit selectionChanged(selection, previousSelection);
     }
     if (selection != previousSelection) {
         emit selectionChanged(selection, previousSelection);
     }


@@ -267,80 +280,119 @@ void KItemListSelectionManager::itemsInserted(const KItemRangeList& itemRanges)
 void KItemListSelectionManager::itemsRemoved(const KItemRangeList& itemRanges)
 {
     // Store the current selection (needed in the selectionChanged() signal)
 void KItemListSelectionManager::itemsRemoved(const KItemRangeList& itemRanges)
 {
     // Store the current selection (needed in the selectionChanged() signal)

-    const QSet<int> previousSelection = selectedItems();
+    const KItemSet previousSelection = selectedItems();
+    const int previousCurrent = m_currentItem;

 
     // Update the current item
 
     // 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
-        // emit it only once in this function -> change the current item manually and emit currentChanged
-        m_currentItem = currentItem;
+    m_currentItem = indexAfterRangesRemoving(m_currentItem, itemRanges, DiscardRemovedIndex);
+    if (m_currentItem != previousCurrent) {

         emit currentChanged(m_currentItem, previousCurrent);
         emit currentChanged(m_currentItem, previousCurrent);

+        if (m_currentItem < 0) {
+            // 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 = indexAfterRangesRemoving(previousCurrent, itemRanges, AdjustRemovedIndex);
+            emit currentChanged(m_currentItem, -1);
+        }

     }
 
     // Update the anchor item
     if (m_anchorItem >= 0) {
     }
 
     // Update the anchor item
     if (m_anchorItem >= 0) {

-        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 = anchorItem;
+        m_anchorItem = indexAfterRangesRemoving(m_anchorItem, itemRanges, DiscardRemovedIndex);

         if (m_anchorItem < 0) {
             m_isAnchoredSelectionActive = false;
         }
     }
 
         if (m_anchorItem < 0) {
             m_isAnchoredSelectionActive = false;
         }
     }
 

-    // Update the selections
+    // Update the selections and the anchor item

     if (!m_selectedItems.isEmpty()) {
     if (!m_selectedItems.isEmpty()) {

-        const QSet<int> previous = m_selectedItems;
+        const KItemSet previous = m_selectedItems;

         m_selectedItems.clear();
         m_selectedItems.clear();

-        QSetIterator<int> it(previous);
-        while (it.hasNext()) {
-            int index = it.next();
-            int dec = 0;
-            foreach (const KItemRange& itemRange, itemRanges) {
-                if (index < itemRange.index) {
-                    break;
-                }

 
 

-                if (index < itemRange.index + itemRange.count) {
-                    // The selection is part of the removed range
-                    // and will get deleted
-                    index = -1;
-                    break;
-                }
+        for (int oldIndex : previous) {
+            const int index = indexAfterRangesRemoving(oldIndex, itemRanges, DiscardRemovedIndex);
+            if (index >= 0)  {
+                m_selectedItems.insert(index);
+            }
+        }
+    }
+
+    const KItemSet selection = selectedItems();
+    if (selection != previousSelection) {
+        emit selectionChanged(selection, previousSelection);
+    }
+
+    Q_ASSERT(m_currentItem < m_model->count());
+    Q_ASSERT(m_anchorItem < m_model->count());
+}
+
+void KItemListSelectionManager::itemsMoved(const KItemRange& itemRange, const QList<int>& movedToIndexes)
+{
+    // Store the current selection (needed in the selectionChanged() signal)
+    const KItemSet previousSelection = selectedItems();
+
+    // endAnchoredSelection() adds all items between m_currentItem and
+    // m_anchorItem to m_selectedItems. They can then be moved
+    // individually later in this function.
+    endAnchoredSelection();
+
+    // 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);

 
 

-                dec += itemRange.count;
+        // 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);
+    }
+
+    // Start a new anchored selection.
+    beginAnchoredSelection(m_currentItem);
+
+    // Update the selections
+    if (!m_selectedItems.isEmpty()) {
+        const KItemSet previous = m_selectedItems;
+        m_selectedItems.clear();
+
+        for (int index : previous) {
+            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);
             }
         }
     }
 
                 m_selectedItems.insert(index);
             }
         }
     }
 

-    const QSet<int> selection = selectedItems();
+    const KItemSet selection = selectedItems();

     if (selection != previousSelection) {
         emit selectionChanged(selection, previousSelection);
     }
 }
 
     if (selection != previousSelection) {
         emit selectionChanged(selection, previousSelection);
     }
 }
 

-#include "kitemlistselectionmanager.moc"
+int KItemListSelectionManager::indexAfterRangesRemoving(int index, const KItemRangeList& itemRanges,
+                                                        const RangesRemovingBehaviour behaviour) const
+{
+    int dec = 0;
+    foreach (const KItemRange& itemRange, itemRanges) {
+        if (index < itemRange.index) {
+            break;
+        }
+
+        dec += itemRange.count;
+
+        const int firstIndexAfterRange = itemRange.index + itemRange.count;
+        if (index < firstIndexAfterRange) {
+            // The index is part of the removed range
+            if (behaviour == DiscardRemovedIndex) {
+                return -1;
+            } else {
+                // Use the first item after the range as new index
+                index = firstIndexAfterRange;
+                break;
+            }
+        }
+    }
+    return qBound(-1, index - dec, m_model->count() - 1);
+}
+