Improve scroll wheel speed by basing it on label height, not icon height

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

diff --git a/src/kitemviews/private/kitemlistsizehintresolver.cpp b/src/kitemviews/private/kitemlistsizehintresolver.cpp
index 5c121c6670d8fbba2981d3a6c9e504acbecbda70..66784f191ac25e2d20c978c53edbc99e20d012d9 100644 (file)
--- a/src/kitemviews/private/kitemlistsizehintresolver.cpp
+++ b/src/kitemviews/private/kitemlistsizehintresolver.cpp
@@ -18,14 +18,12 @@
  ***************************************************************************/
 
 #include "kitemlistsizehintresolver.h"
  ***************************************************************************/
 
 #include "kitemlistsizehintresolver.h"

-
-#include <kitemviews/kitemlistview.h>
+#include "kitemviews/kitemlistview.h"

 
 KItemListSizeHintResolver::KItemListSizeHintResolver(const KItemListView* itemListView) :
     m_itemListView(itemListView),
     m_logicalHeightHintCache(),
     m_logicalWidthHint(0.0),
 
 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)
 {
     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();
 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<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;
         ++index;
     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);
 {
     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;
     }
 }
         m_needsResolving = false;
     }
 }