X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/blobdiff_plain/462982faa361c79daab43ce526ae64646b1ea63c..99c48acc8ea5e614e447a8f62d92c8d12e9cf58b:/src/kitemviews/private/kitemlistsizehintresolver.cpp

diff --git a/src/kitemviews/private/kitemlistsizehintresolver.cpp b/src/kitemviews/private/kitemlistsizehintresolver.cpp
index 7021c5296..b7165e8c3 100644
--- a/src/kitemviews/private/kitemlistsizehintresolver.cpp
+++ b/src/kitemviews/private/kitemlistsizehintresolver.cpp
@@ -7,12 +7,12 @@
 #include "kitemlistsizehintresolver.h"
 #include "kitemviews/kitemlistview.h"
 
-KItemListSizeHintResolver::KItemListSizeHintResolver(const KItemListView* itemListView) :
-    m_itemListView(itemListView),
-    m_logicalHeightHintCache(),
-    m_logicalWidthHint(0.0),
-    m_minHeightHint(0.0),
-    m_needsResolving(false)
+KItemListSizeHintResolver::KItemListSizeHintResolver(const KItemListView *itemListView)
+    : m_itemListView(itemListView)
+    , m_logicalHeightHintCache()
+    , m_logicalWidthHint(0.0)
+    , m_minHeightHint(0.0)
+    , m_needsResolving(false)
 {
 }
 
@@ -29,13 +29,18 @@ QSizeF KItemListSizeHintResolver::minSizeHint()
 QSizeF KItemListSizeHintResolver::sizeHint(int index)
 {
     updateCache();
-    return QSizeF(m_logicalWidthHint, m_logicalHeightHintCache.at(index));
+    return QSizeF(m_logicalWidthHint, m_logicalHeightHintCache.at(index).first);
 }
 
-void KItemListSizeHintResolver::itemsInserted(const KItemRangeList& itemRanges)
+bool KItemListSizeHintResolver::isElided(int index)
+{
+    return m_logicalHeightHintCache.at(index).second;
+}
+
+void KItemListSizeHintResolver::itemsInserted(const KItemRangeList &itemRanges)
 {
     int insertedCount = 0;
-    foreach (const KItemRange& range, itemRanges) {
+    for (const KItemRange &range : itemRanges) {
         insertedCount += range.count;
     }
 
@@ -44,14 +49,14 @@ void KItemListSizeHintResolver::itemsInserted(const KItemRangeList& itemRanges)
 
     // We build the new list from the end to the beginning to mimize the
     // number of moves.
-    m_logicalHeightHintCache.insert(m_logicalHeightHintCache.end(), insertedCount, 0.0);
+    m_logicalHeightHintCache.insert(m_logicalHeightHintCache.end(), insertedCount, std::make_pair(0.0, false));
 
     int sourceIndex = currentCount - 1;
     int targetIndex = m_logicalHeightHintCache.count() - 1;
     int itemsToInsertBeforeCurrentRange = insertedCount;
 
     for (int rangeIndex = itemRanges.count() - 1; rangeIndex >= 0; --rangeIndex) {
-        const KItemRange& range = itemRanges.at(rangeIndex);
+        const KItemRange &range = itemRanges.at(rangeIndex);
         itemsToInsertBeforeCurrentRange -= range.count;
 
         // First: move all existing items that must be put behind 'range'.
@@ -63,7 +68,7 @@ void KItemListSizeHintResolver::itemsInserted(const KItemRangeList& itemRanges)
 
         // Then: insert QSizeF() for the items which are inserted into 'range'.
         while (targetIndex >= itemsToInsertBeforeCurrentRange + range.index) {
-            m_logicalHeightHintCache[targetIndex] = 0.0;
+            m_logicalHeightHintCache[targetIndex] = std::make_pair(0.0, false);
             --targetIndex;
         }
     }
@@ -73,16 +78,16 @@ void KItemListSizeHintResolver::itemsInserted(const KItemRangeList& itemRanges)
     Q_ASSERT(m_logicalHeightHintCache.count() == m_itemListView->model()->count());
 }
 
-void KItemListSizeHintResolver::itemsRemoved(const KItemRangeList& itemRanges)
+void KItemListSizeHintResolver::itemsRemoved(const KItemRangeList &itemRanges)
 {
-    const QVector<qreal>::iterator begin = m_logicalHeightHintCache.begin();
-    const QVector<qreal>::iterator end = m_logicalHeightHintCache.end();
+    const QVector<std::pair<qreal, bool>>::iterator begin = m_logicalHeightHintCache.begin();
+    const QVector<std::pair<qreal, bool>>::iterator end = m_logicalHeightHintCache.end();
 
     KItemRangeList::const_iterator rangeIt = itemRanges.constBegin();
     const KItemRangeList::const_iterator rangeEnd = itemRanges.constEnd();
 
-    QVector<qreal>::iterator destIt = begin + rangeIt->index;
-    QVector<qreal>::iterator srcIt = destIt + rangeIt->count;
+    QVector<std::pair<qreal, bool>>::iterator destIt = begin + rangeIt->index;
+    QVector<std::pair<qreal, bool>>::iterator srcIt = destIt + rangeIt->count;
 
     ++rangeIt;
 
@@ -107,9 +112,9 @@ void KItemListSizeHintResolver::itemsRemoved(const KItemRangeList& itemRanges)
     }
 }
 
-void KItemListSizeHintResolver::itemsMoved(const KItemRange& range, const QList<int>& movedToIndexes)
+void KItemListSizeHintResolver::itemsMoved(const KItemRange &range, const QList<int> &movedToIndexes)
 {
-    QVector<qreal> newLogicalHeightHintCache(m_logicalHeightHintCache);
+    QVector<std::pair<qreal, bool>> newLogicalHeightHintCache(m_logicalHeightHintCache);
 
     const int movedRangeEnd = range.index + range.count;
     for (int i = range.index; i < movedRangeEnd; ++i) {
@@ -120,11 +125,11 @@ void KItemListSizeHintResolver::itemsMoved(const KItemRange& range, const QList<
     m_logicalHeightHintCache = newLogicalHeightHintCache;
 }
 
-void KItemListSizeHintResolver::itemsChanged(int index, int count, const QSet<QByteArray>& roles)
+void KItemListSizeHintResolver::itemsChanged(int index, int count, const QSet<QByteArray> &roles)
 {
     Q_UNUSED(roles)
     while (count) {
-        m_logicalHeightHintCache[index] = 0.0;
+        m_logicalHeightHintCache[index] = std::make_pair(0.0, false);
         ++index;
         --count;
     }
@@ -134,7 +139,7 @@ void KItemListSizeHintResolver::itemsChanged(int index, int count, const QSet<QB
 
 void KItemListSizeHintResolver::clearCache()
 {
-    m_logicalHeightHintCache.fill(0.0);
+    m_logicalHeightHintCache.fill(std::make_pair(0.0, false));
     m_needsResolving = true;
 }