Fix selection rect after porting from QFontMetrics::width()

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

diff --git a/src/kitemviews/kitemlistselectionmanager.cpp b/src/kitemviews/kitemlistselectionmanager.cpp
index 79c3370b47016980d0d950c8184eacbe3055458f..6bee19414ce1b7736d2a9d380287cc532837919c 100644 (file)
--- a/src/kitemviews/kitemlistselectionmanager.cpp
+++ b/src/kitemviews/kitemlistselectionmanager.cpp
@@ -2,8 +2,7 @@
  *   Copyright (C) 2011 by Peter Penz <peter.penz19@gmail.com>             *
  *   Copyright (C) 2011 by Frank Reininghaus <frank78ac@googlemail.com>    *
  *                                                                         *
  *   Copyright (C) 2011 by Peter Penz <peter.penz19@gmail.com>             *
  *   Copyright (C) 2011 by Frank Reininghaus <frank78ac@googlemail.com>    *
  *                                                                         *

- *   Based on the Itemviews NG project from Trolltech Labs:                *
- *   http://qt.gitorious.org/qt-labs/itemviews-ng                          *
+ *   Based on the Itemviews NG project from Trolltech Labs                 *

  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
  *   it under the terms of the GNU General Public License as published by  *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
  *   it under the terms of the GNU General Public License as published by  *


@@ -23,16 +22,13 @@
 
 #include "kitemlistselectionmanager.h"
 
 
 #include "kitemlistselectionmanager.h"
 

-#include "kitemmodelbase.h"
-#include <KDebug>
-

 KItemListSelectionManager::KItemListSelectionManager(QObject* parent) :
     QObject(parent),
     m_currentItem(-1),
     m_anchorItem(-1),
     m_selectedItems(),
     m_isAnchoredSelectionActive(false),
 KItemListSelectionManager::KItemListSelectionManager(QObject* parent) :
     QObject(parent),
     m_currentItem(-1),
     m_anchorItem(-1),
     m_selectedItems(),
     m_isAnchoredSelectionActive(false),

-    m_model(0)
+    m_model(nullptr)

 {
 }
 
 {
 }
 


@@ -43,7 +39,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 +51,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 +64,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);


@@ -127,7 +123,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);
 


@@ -160,7 +156,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);
     }


@@ -168,12 +164,22 @@ 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;
+        emit selectionChanged(KItemSet(), previous);
+    }
+}
+
+void KItemListSelectionManager::replaceSelection(int index, int count)
+{
+    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);

     }
     }

+    setSelected(index, count);

 }
 
 void KItemListSelectionManager::beginAnchoredSelection(int anchor)
 }
 
 void KItemListSelectionManager::beginAnchoredSelection(int anchor)


@@ -221,7 +227,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) {


@@ -238,6 +244,9 @@ void KItemListSelectionManager::itemsInserted(const KItemRangeList& itemRanges)
         // 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 += inc;
         // 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 += inc;

+        if (m_currentItem >= m_model->count()) {
+            m_currentItem = -1;
+        }

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


@@ -257,12 +266,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();

-        m_selectedItems.reserve(previous.count());
-        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) {


@@ -274,7 +281,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);
     }


@@ -283,25 +290,24 @@ 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;
-        // 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(m_currentItem, itemRanges);
+    m_currentItem = indexAfterRangesRemoving(m_currentItem, itemRanges, DiscardRemovedIndex);
+    if (m_currentItem != previousCurrent) {
+        emit currentChanged(m_currentItem, previousCurrent);

         if (m_currentItem < 0) {
         if (m_currentItem < 0) {

-            m_currentItem = qMin(previousCurrent, m_model->count() - 1);
-        }
-        if (m_currentItem != previousCurrent) {
-            emit currentChanged(m_currentItem, previousCurrent);
+            // 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) {

-        m_anchorItem = indexAfterRangesRemoving(m_anchorItem, itemRanges);
+        m_anchorItem = indexAfterRangesRemoving(m_anchorItem, itemRanges, DiscardRemovedIndex);

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


@@ -309,19 +315,18 @@ void KItemListSelectionManager::itemsRemoved(const KItemRangeList& itemRanges)
 
     // Update the selections and the anchor item
     if (!m_selectedItems.isEmpty()) {
 
     // Update the selections and the anchor item
     if (!m_selectedItems.isEmpty()) {

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

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

-        m_selectedItems.reserve(previous.count());
-        QSetIterator<int> it(previous);
-        while (it.hasNext()) {
-            const int index = indexAfterRangesRemoving(it.next(), itemRanges);
+
+        for (int oldIndex : previous) {
+            const int index = indexAfterRangesRemoving(oldIndex, itemRanges, DiscardRemovedIndex);

             if (index >= 0)  {
                 m_selectedItems.insert(index);
             }
         }
     }
 
             if (index >= 0)  {
                 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);
     }


@@ -333,7 +338,15 @@ void KItemListSelectionManager::itemsRemoved(const KItemRangeList& itemRanges)
 void KItemListSelectionManager::itemsMoved(const KItemRange& itemRange, const QList<int>& movedToIndexes)
 {
     // Store the current selection (needed in the selectionChanged() signal)
 void KItemListSelectionManager::itemsMoved(const KItemRange& itemRange, const QList<int>& movedToIndexes)
 {
     // Store the current selection (needed in the selectionChanged() signal)

-    const QSet<int> previousSelection = selectedItems();
+    const KItemSet previousSelection = selectedItems();
+
+    // Store whether we were doing an anchored selection
+    const bool wasInAnchoredSelection = isAnchoredSelectionActive();
+
+    // 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) {
 
     // Update the current item
     if (m_currentItem >= itemRange.index && m_currentItem < itemRange.index + itemRange.count) {


@@ -346,19 +359,17 @@ void KItemListSelectionManager::itemsMoved(const KItemRange& itemRange, const QL
         emit currentChanged(newCurrentItem, previousCurrentItem);
     }
 
         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);
+    // Start a new anchored selection.
+    if (wasInAnchoredSelection) {
+        beginAnchoredSelection(m_currentItem);

     }
 
     // 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();

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

             if (index >= itemRange.index && index < itemRange.index + itemRange.count) {
                 m_selectedItems.insert(movedToIndexes.at(index - itemRange.index));
             }
             if (index >= itemRange.index && index < itemRange.index + itemRange.count) {
                 m_selectedItems.insert(movedToIndexes.at(index - itemRange.index));
             }


@@ -368,13 +379,14 @@ void KItemListSelectionManager::itemsMoved(const KItemRange& itemRange, const QL
         }
     }
 
         }
     }
 

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

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

-int KItemListSelectionManager::indexAfterRangesRemoving(int index, const KItemRangeList& itemRanges) const
+int KItemListSelectionManager::indexAfterRangesRemoving(int index, const KItemRangeList& itemRanges,
+                                                        const RangesRemovingBehaviour behaviour) const

 {
     int dec = 0;
     foreach (const KItemRange& itemRange, itemRanges) {
 {
     int dec = 0;
     foreach (const KItemRange& itemRange, itemRanges) {


@@ -382,13 +394,20 @@ int KItemListSelectionManager::indexAfterRangesRemoving(int index, const KItemRa
             break;
         }
 
             break;
         }
 

-        if (index < itemRange.index + itemRange.count) {
+        dec += itemRange.count;
+
+        const int firstIndexAfterRange = itemRange.index + itemRange.count;
+        if (index < firstIndexAfterRange) {

             // The index is part of the removed range
             // The index is part of the removed range

-            return -1;
+            if (behaviour == DiscardRemovedIndex) {
+                return -1;
+            } else {
+                // Use the first item after the range as new index
+                index = firstIndexAfterRange;
+                break;
+            }

         }
         }

-
-        dec += itemRange.count;

     }
     }

-    return index - dec;
+    return qBound(-1, index - dec, m_model->count() - 1);

 }
 }

-#include "kitemlistselectionmanager.moc"
+