X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/blobdiff_plain/c12dc996f535f787ab828560068a2c8b7f98c5cf..6c55cf4b6a89d0d58ee7a29122ac68ac70fad65c:/src/kitemviews/private/kitemlistsizehintresolver.cpp

diff --git a/src/kitemviews/private/kitemlistsizehintresolver.cpp b/src/kitemviews/private/kitemlistsizehintresolver.cpp
index 1d8067026..b7165e8c3 100644
--- a/src/kitemviews/private/kitemlistsizehintresolver.cpp
+++ b/src/kitemviews/private/kitemlistsizehintresolver.cpp
@@ -1,31 +1,18 @@
-/***************************************************************************
- *   Copyright (C) 2011 by Peter Penz <peter.penz19@gmail.com>             *
- *                                                                         *
- *   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  *
- *   the Free Software Foundation; either version 2 of the License, or     *
- *   (at your option) any later version.                                   *
- *                                                                         *
- *   This program is distributed in the hope that it will be useful,       *
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of        *
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         *
- *   GNU General Public License for more details.                          *
- *                                                                         *
- *   You should have received a copy of the GNU General Public License     *
- *   along with this program; if not, write to the                         *
- *   Free Software Foundation, Inc.,                                       *
- *   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA            *
- ***************************************************************************/
+/*
+ * SPDX-FileCopyrightText: 2011 Peter Penz <peter.penz19@gmail.com>
+ *
+ * SPDX-License-Identifier: GPL-2.0-or-later
+ */
 
 #include "kitemlistsizehintresolver.h"
-
-#include <kitemviews/kitemlistview.h>
-
-KItemListSizeHintResolver::KItemListSizeHintResolver(const KItemListView* itemListView) :
-    m_itemListView(itemListView),
-    m_logicalHeightHintCache(),
-    m_logicalWidthHint(0.0),
-    m_needsResolving(false)
+#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)
 {
 }
 
@@ -33,16 +20,27 @@ KItemListSizeHintResolver::~KItemListSizeHintResolver()
 {
 }
 
+QSizeF KItemListSizeHintResolver::minSizeHint()
+{
+    updateCache();
+    return QSizeF(m_logicalWidthHint, m_minHeightHint);
+}
+
 QSizeF KItemListSizeHintResolver::sizeHint(int index)
 {
     updateCache();
-    return QSizeF(m_logicalWidthHint, m_logicalHeightHintCache.at(index));
+    return QSizeF(m_logicalWidthHint, m_logicalHeightHintCache.at(index).first);
+}
+
+bool KItemListSizeHintResolver::isElided(int index)
+{
+    return m_logicalHeightHintCache.at(index).second;
 }
 
-void KItemListSizeHintResolver::itemsInserted(const KItemRangeList& itemRanges)
+void KItemListSizeHintResolver::itemsInserted(const KItemRangeList &itemRanges)
 {
     int insertedCount = 0;
-    foreach (const KItemRange& range, itemRanges) {
+    for (const KItemRange &range : itemRanges) {
         insertedCount += range.count;
     }
 
@@ -51,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'.
@@ -70,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;
         }
     }
@@ -80,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;
 
@@ -114,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) {
@@ -127,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);
+    Q_UNUSED(roles)
     while (count) {
-        m_logicalHeightHintCache[index] = 0.0;
+        m_logicalHeightHintCache[index] = std::make_pair(0.0, false);
         ++index;
         --count;
     }
@@ -141,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;
 }