Build TerminalPanel also on Windows

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

diff --git a/src/kitemviews/private/kitemlistviewlayouter.cpp b/src/kitemviews/private/kitemlistviewlayouter.cpp
index 90e8a6d0f3096ba5dd577a091c8c28d6cbee90e0..ca39426446a390e7cf0f8c9f08dbf55cd6ad1226 100644 (file)
--- a/src/kitemviews/private/kitemlistviewlayouter.cpp
+++ b/src/kitemviews/private/kitemlistviewlayouter.cpp
@@ -22,11 +22,11 @@
 #include <kitemviews/kitemmodelbase.h>
 #include "kitemlistsizehintresolver.h"
 
 #include <kitemviews/kitemmodelbase.h>
 #include "kitemlistsizehintresolver.h"
 

-#include <KDebug>
+#include "dolphindebug.h"

 
 // #define KITEMLISTVIEWLAYOUTER_DEBUG
 
 
 // #define KITEMLISTVIEWLAYOUTER_DEBUG
 

-KItemListViewLayouter::KItemListViewLayouter(QObject* parent) :
+KItemListViewLayouter::KItemListViewLayouter(KItemListSizeHintResolver* sizeHintResolver, QObject* parent) :

     QObject(parent),
     m_dirty(true),
     m_visibleIndexesDirty(true),
     QObject(parent),
     m_dirty(true),
     m_visibleIndexesDirty(true),


@@ -35,8 +35,8 @@ KItemListViewLayouter::KItemListViewLayouter(QObject* parent) :
     m_itemSize(128, 128),
     m_itemMargin(),
     m_headerHeight(0),
     m_itemSize(128, 128),
     m_itemMargin(),
     m_headerHeight(0),

-    m_model(0),
-    m_sizeHintResolver(0),
+    m_model(nullptr),
+    m_sizeHintResolver(sizeHintResolver),

     m_scrollOffset(0),
     m_maximumScrollOffset(0),
     m_itemOffset(0),
     m_scrollOffset(0),
     m_maximumScrollOffset(0),
     m_itemOffset(0),


@@ -53,6 +53,7 @@ KItemListViewLayouter::KItemListViewLayouter(QObject* parent) :
     m_groupHeaderMargin(0),
     m_itemInfos()
 {
     m_groupHeaderMargin(0),
     m_itemInfos()
 {

+    Q_ASSERT(m_sizeHintResolver);

 }
 
 KItemListViewLayouter::~KItemListViewLayouter()
 }
 
 KItemListViewLayouter::~KItemListViewLayouter()


@@ -209,19 +210,6 @@ const KItemModelBase* KItemListViewLayouter::model() const
     return m_model;
 }
 
     return m_model;
 }
 

-void KItemListViewLayouter::setSizeHintResolver(const KItemListSizeHintResolver* sizeHintResolver)
-{
-    if (m_sizeHintResolver != sizeHintResolver) {
-        m_sizeHintResolver = sizeHintResolver;
-        m_dirty = true;
-    }
-}
-
-const KItemListSizeHintResolver* KItemListViewLayouter::sizeHintResolver() const
-{
-    return m_sizeHintResolver;
-}
-

 int KItemListViewLayouter::firstVisibleIndex() const
 {
     const_cast<KItemListViewLayouter*>(this)->doLayout();
 int KItemListViewLayouter::firstVisibleIndex() const
 {
     const_cast<KItemListViewLayouter*>(this)->doLayout();


@@ -241,12 +229,7 @@ QRectF KItemListViewLayouter::itemRect(int index) const
         return QRectF();
     }
 
         return QRectF();
     }
 

-    QSizeF sizeHint;
-    if (m_sizeHintResolver) {
-        sizeHint = m_sizeHintResolver->sizeHint(index);
-    } else {
-        sizeHint = m_itemSize;
-    }
+    QSizeF sizeHint = m_sizeHintResolver->sizeHint(index);

 
     const qreal x = m_columnOffsets.at(m_itemInfos.at(index).column);
     const qreal y = m_rowOffsets.at(m_itemInfos.at(index).row);
 
     const qreal x = m_columnOffsets.at(m_itemInfos.at(index).column);
     const qreal y = m_rowOffsets.at(m_itemInfos.at(index).row);


@@ -256,6 +239,7 @@ QRectF KItemListViewLayouter::itemRect(int index) const
         // to get the physical horizontal direction
         QPointF pos(y, x);
         pos.rx() -= m_scrollOffset;
         // to get the physical horizontal direction
         QPointF pos(y, x);
         pos.rx() -= m_scrollOffset;

+        sizeHint.transpose();

         return QRectF(pos, sizeHint);
     }
 
         return QRectF(pos, sizeHint);
     }
 


@@ -299,12 +283,9 @@ QRectF KItemListViewLayouter::groupHeaderRect(int index) const
                 break;
             }
 
                 break;
             }
 

-            qreal itemWidth;
-            if (m_sizeHintResolver) {
-                itemWidth = m_sizeHintResolver->sizeHint(index).width();
-            } else {
-                itemWidth = m_itemSize.width();
-            }
+            const qreal itemWidth = (m_scrollOrientation == Qt::Vertical)
+                                     ? m_sizeHintResolver->sizeHint(index).width()
+                                     : m_sizeHintResolver->sizeHint(index).height();

 
             if (itemWidth > headerWidth) {
                 headerWidth = itemWidth;
 
             if (itemWidth > headerWidth) {
                 headerWidth = itemWidth;


@@ -482,12 +463,10 @@ void KItemListViewLayouter::doLayout()
             int column = 0;
             while (index < itemCount && column < m_columnCount) {
                 qreal requiredItemHeight = itemSize.height();
             int column = 0;
             while (index < itemCount && column < m_columnCount) {
                 qreal requiredItemHeight = itemSize.height();

-                if (m_sizeHintResolver) {
-                    const QSizeF sizeHint = m_sizeHintResolver->sizeHint(index);
-                    const qreal sizeHintHeight = horizontalScrolling ? sizeHint.width() : sizeHint.height();
-                    if (sizeHintHeight > requiredItemHeight) {
-                        requiredItemHeight = sizeHintHeight;
-                    }
+                const QSizeF sizeHint = m_sizeHintResolver->sizeHint(index);
+                const qreal sizeHintHeight = sizeHint.height();
+                if (sizeHintHeight > requiredItemHeight) {
+                    requiredItemHeight = sizeHintHeight;

                 }
 
                 ItemInfo& itemInfo = m_itemInfos[index];
                 }
 
                 ItemInfo& itemInfo = m_itemInfos[index];


@@ -537,7 +516,7 @@ void KItemListViewLayouter::doLayout()
         }
 
 #ifdef KITEMLISTVIEWLAYOUTER_DEBUG
         }
 
 #ifdef KITEMLISTVIEWLAYOUTER_DEBUG

-        kDebug() << "[TIME] doLayout() for " << m_model->count() << "items:" << timer.elapsed();
+        qCDebug(DolphinDebug) << "[TIME] doLayout() for " << m_model->count() << "items:" << timer.elapsed();

 #endif
         m_dirty = false;
     }
 #endif
         m_dirty = false;
     }


@@ -642,4 +621,3 @@ qreal KItemListViewLayouter::minimumGroupHeaderWidth() const
     return 100;
 }
 
     return 100;
 }
 

-#include "kitemlistviewlayouter.moc"