Correct searchbox, split view transitions between tabs

[dolphin.git] / src / kitemviews / private / kitemlistsizehintresolver.cpp

diff --git a/src/kitemviews/private/kitemlistsizehintresolver.cpp b/src/kitemviews/private/kitemlistsizehintresolver.cpp
index 0e2286b453a9c539358528318288c9e695de1b6c..02f1865b349c80caa7fd5a2f32b8301f32794b8d 100644 (file)
--- a/src/kitemviews/private/kitemlistsizehintresolver.cpp
+++ b/src/kitemviews/private/kitemlistsizehintresolver.cpp
@@ -23,7 +23,10 @@
 
 KItemListSizeHintResolver::KItemListSizeHintResolver(const KItemListView* itemListView) :
     m_itemListView(itemListView),
 
 KItemListSizeHintResolver::KItemListSizeHintResolver(const KItemListView* itemListView) :
     m_itemListView(itemListView),

-    m_sizeHintCache()
+    m_logicalHeightHintCache(),
+    m_logicalWidthHint(0.0),
+    m_logicalHeightHint(0.0),
+    m_needsResolving(false)

 {
 }
 
 {
 }
 


@@ -31,14 +34,16 @@ KItemListSizeHintResolver::~KItemListSizeHintResolver()
 {
 }
 
 {
 }
 

-QSizeF KItemListSizeHintResolver::sizeHint(int index) const
+QSizeF KItemListSizeHintResolver::maxSizeHint()

 {
 {

-    QSizeF size = m_sizeHintCache.at(index);
-    if (size.isEmpty()) {
-        size = m_itemListView->itemSizeHint(index);
-        m_sizeHintCache[index] = size;
-    }
-    return size;
+    updateCache();
+    return QSizeF(m_logicalWidthHint, m_logicalHeightHint);
+}
+
+QSizeF KItemListSizeHintResolver::sizeHint(int index)
+{
+    updateCache();
+    return QSizeF(m_logicalWidthHint, m_logicalHeightHintCache.at(index));

 }
 
 void KItemListSizeHintResolver::itemsInserted(const KItemRangeList& itemRanges)
 }
 
 void KItemListSizeHintResolver::itemsInserted(const KItemRangeList& itemRanges)


@@ -48,15 +53,15 @@ void KItemListSizeHintResolver::itemsInserted(const KItemRangeList& itemRanges)
         insertedCount += range.count;
     }
 
         insertedCount += range.count;
     }
 

-    const int currentCount = m_sizeHintCache.count();
-    m_sizeHintCache.reserve(currentCount + insertedCount);
+    const int currentCount = m_logicalHeightHintCache.count();
+    m_logicalHeightHintCache.reserve(currentCount + insertedCount);

 
     // We build the new list from the end to the beginning to mimize the
     // number of moves.
 
     // We build the new list from the end to the beginning to mimize the
     // number of moves.

-    m_sizeHintCache.insert(m_sizeHintCache.end(), insertedCount, QSizeF());
+    m_logicalHeightHintCache.insert(m_logicalHeightHintCache.end(), insertedCount, 0.0);

 
     int sourceIndex = currentCount - 1;
 
     int sourceIndex = currentCount - 1;

-    int targetIndex = m_sizeHintCache.count() - 1;
+    int targetIndex = m_logicalHeightHintCache.count() - 1;

     int itemsToInsertBeforeCurrentRange = insertedCount;
 
     for (int rangeIndex = itemRanges.count() - 1; rangeIndex >= 0; --rangeIndex) {
     int itemsToInsertBeforeCurrentRange = insertedCount;
 
     for (int rangeIndex = itemRanges.count() - 1; rangeIndex >= 0; --rangeIndex) {


@@ -65,31 +70,33 @@ void KItemListSizeHintResolver::itemsInserted(const KItemRangeList& itemRanges)
 
         // First: move all existing items that must be put behind 'range'.
         while (targetIndex >= itemsToInsertBeforeCurrentRange + range.index + range.count) {
 
         // First: move all existing items that must be put behind 'range'.
         while (targetIndex >= itemsToInsertBeforeCurrentRange + range.index + range.count) {

-            m_sizeHintCache[targetIndex] = m_sizeHintCache[sourceIndex];
+            m_logicalHeightHintCache[targetIndex] = m_logicalHeightHintCache[sourceIndex];

             --sourceIndex;
             --targetIndex;
         }
 
         // Then: insert QSizeF() for the items which are inserted into 'range'.
         while (targetIndex >= itemsToInsertBeforeCurrentRange + range.index) {
             --sourceIndex;
             --targetIndex;
         }
 
         // Then: insert QSizeF() for the items which are inserted into 'range'.
         while (targetIndex >= itemsToInsertBeforeCurrentRange + range.index) {

-            m_sizeHintCache[targetIndex] = QSizeF();
+            m_logicalHeightHintCache[targetIndex] = 0.0;

             --targetIndex;
         }
     }
 
             --targetIndex;
         }
     }
 

-    Q_ASSERT(m_sizeHintCache.count() == m_itemListView->model()->count());
+    m_needsResolving = true;
+
+    Q_ASSERT(m_logicalHeightHintCache.count() == m_itemListView->model()->count());

 }
 
 void KItemListSizeHintResolver::itemsRemoved(const KItemRangeList& itemRanges)
 {
 }
 
 void KItemListSizeHintResolver::itemsRemoved(const KItemRangeList& itemRanges)
 {

-    const QVector<QSizeF>::iterator begin = m_sizeHintCache.begin();
-    const QVector<QSizeF>::iterator end = m_sizeHintCache.end();
+    const QVector<qreal>::iterator begin = m_logicalHeightHintCache.begin();
+    const QVector<qreal>::iterator end = m_logicalHeightHintCache.end();

 
     KItemRangeList::const_iterator rangeIt = itemRanges.constBegin();
     const KItemRangeList::const_iterator rangeEnd = itemRanges.constEnd();
 
 
     KItemRangeList::const_iterator rangeIt = itemRanges.constBegin();
     const KItemRangeList::const_iterator rangeEnd = itemRanges.constEnd();
 

-    QVector<QSizeF>::iterator destIt = begin + rangeIt->index;
-    QVector<QSizeF>::iterator srcIt = destIt + rangeIt->count;
+    QVector<qreal>::iterator destIt = begin + rangeIt->index;
+    QVector<qreal>::iterator srcIt = destIt + rangeIt->count;

 
     ++rangeIt;
 
 
     ++rangeIt;
 


@@ -105,39 +112,56 @@ void KItemListSizeHintResolver::itemsRemoved(const KItemRangeList& itemRanges)
         }
     }
 
         }
     }
 

-    m_sizeHintCache.erase(destIt, end);
+    m_logicalHeightHintCache.erase(destIt, end);

 
     // Note that the cache size might temporarily not match the model size if
     // this function is called from KItemListView::setModel() to empty the cache.
 
     // Note that the cache size might temporarily not match the model size if
     // this function is called from KItemListView::setModel() to empty the cache.

-    if (!m_sizeHintCache.isEmpty() && m_itemListView->model()) {
-        Q_ASSERT(m_sizeHintCache.count() == m_itemListView->model()->count());
+    if (!m_logicalHeightHintCache.isEmpty() && m_itemListView->model()) {
+        Q_ASSERT(m_logicalHeightHintCache.count() == m_itemListView->model()->count());

     }
 }
 
 void KItemListSizeHintResolver::itemsMoved(const KItemRange& range, const QList<int>& movedToIndexes)
 {
     }
 }
 
 void KItemListSizeHintResolver::itemsMoved(const KItemRange& range, const QList<int>& movedToIndexes)
 {

-    QVector<QSizeF> newSizeHintCache(m_sizeHintCache);
+    QVector<qreal> newLogicalHeightHintCache(m_logicalHeightHintCache);

 
     const int movedRangeEnd = range.index + range.count;
     for (int i = range.index; i < movedRangeEnd; ++i) {
         const int newIndex = movedToIndexes.at(i - range.index);
 
     const int movedRangeEnd = range.index + range.count;
     for (int i = range.index; i < movedRangeEnd; ++i) {
         const int newIndex = movedToIndexes.at(i - range.index);

-        newSizeHintCache[newIndex] = m_sizeHintCache.at(i);
+        newLogicalHeightHintCache[newIndex] = m_logicalHeightHintCache.at(i);

     }
 
     }
 

-    m_sizeHintCache = newSizeHintCache;
+    m_logicalHeightHintCache = newLogicalHeightHintCache;

 }
 
 void KItemListSizeHintResolver::itemsChanged(int index, int count, const QSet<QByteArray>& roles)
 {
     Q_UNUSED(roles);
     while (count) {
 }
 
 void KItemListSizeHintResolver::itemsChanged(int index, int count, const QSet<QByteArray>& roles)
 {
     Q_UNUSED(roles);
     while (count) {

-        m_sizeHintCache[index] = QSizeF();
+        m_logicalHeightHintCache[index] = 0.0;

         ++index;
         --count;
     }
         ++index;
         --count;
     }

+
+    m_needsResolving = true;

 }
 
 void KItemListSizeHintResolver::clearCache()
 {
 }
 
 void KItemListSizeHintResolver::clearCache()
 {

-    m_sizeHintCache.fill(QSizeF());
+    m_logicalHeightHintCache.fill(0.0);
+    m_needsResolving = true;
+}
+
+void KItemListSizeHintResolver::updateCache()
+{
+    if (m_needsResolving) {
+        m_itemListView->calculateItemSizeHints(m_logicalHeightHintCache, m_logicalWidthHint);
+        // Set logical height as the max cached height (if the cache is not empty).
+        if (m_logicalHeightHintCache.isEmpty()) {
+            m_logicalHeightHint = 0.0;
+        } else {
+            m_logicalHeightHint = *std::max_element(m_logicalHeightHintCache.begin(), m_logicalHeightHintCache.end());
+        }
+        m_needsResolving = false;
+    }

 }
 }