X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/blobdiff_plain/0dd0b65bf02f52da0d2e9d270160e69b81a357ca..403de19d9c036dd28481d3b62bdb0f49f0792fbf:/src/kitemviews/private/kitemlistsizehintresolver.cpp diff --git a/src/kitemviews/private/kitemlistsizehintresolver.cpp b/src/kitemviews/private/kitemlistsizehintresolver.cpp index 5c121c667..66784f191 100644 --- a/src/kitemviews/private/kitemlistsizehintresolver.cpp +++ b/src/kitemviews/private/kitemlistsizehintresolver.cpp @@ -18,14 +18,12 @@ ***************************************************************************/ #include "kitemlistsizehintresolver.h" - -#include +#include "kitemviews/kitemlistview.h" KItemListSizeHintResolver::KItemListSizeHintResolver(const KItemListView* itemListView) : m_itemListView(itemListView), m_logicalHeightHintCache(), m_logicalWidthHint(0.0), - m_logicalHeightHint(0.0), m_minHeightHint(0.0), m_needsResolving(false) { @@ -35,12 +33,6 @@ KItemListSizeHintResolver::~KItemListSizeHintResolver() { } -QSizeF KItemListSizeHintResolver::maxSizeHint() -{ - updateCache(); - return QSizeF(m_logicalWidthHint, m_logicalHeightHint); -} - QSizeF KItemListSizeHintResolver::minSizeHint() { updateCache(); @@ -143,7 +135,7 @@ void KItemListSizeHintResolver::itemsMoved(const KItemRange& range, const QList< void KItemListSizeHintResolver::itemsChanged(int index, int count, const QSet& roles) { - Q_UNUSED(roles); + Q_UNUSED(roles) while (count) { m_logicalHeightHintCache[index] = 0.0; ++index; @@ -163,13 +155,6 @@ 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_minHeightHint = *std::min_element(m_logicalHeightHintCache.begin(), m_logicalHeightHintCache.end()); - } m_needsResolving = false; } }