Fix icon alignment issue in the details view

[dolphin.git] / src / kitemviews / kfileitemlistwidget.cpp

diff --git a/src/kitemviews/kfileitemlistwidget.cpp b/src/kitemviews/kfileitemlistwidget.cpp
index 13832a80bc3fb211a2fd866c29b13250e5b0a0b7..62a2383d4256603ed3cfb3814a51c4d9805bbf47 100644 (file)
--- a/src/kitemviews/kfileitemlistwidget.cpp
+++ b/src/kitemviews/kfileitemlistwidget.cpp
@@ -38,13 +38,13 @@
 #include <QTextLayout>
 #include <QTextLine>
 
-//#define KFILEITEMLISTWIDGET_DEBUG
+// #define KFILEITEMLISTWIDGET_DEBUG
 
 KFileItemListWidget::KFileItemListWidget(QGraphicsItem* parent) :
     KItemListWidget(parent),
     m_isCut(false),
     m_isHidden(false),
-    m_isDir(false),
+    m_isExpandable(false),
     m_dirtyLayout(true),
     m_dirtyContent(true),
     m_dirtyContentRoles(),
@@ -95,7 +95,7 @@ void KFileItemListWidget::paint(QPainter* painter, const QStyleOptionGraphicsIte
     KItemListWidget::paint(painter, option, widget);
 
     // Draw expansion toggle '>' or 'V'
-    if (m_isDir && !m_expansionArea.isEmpty()) {
+    if (m_isExpandable && !m_expansionArea.isEmpty()) {
         QStyleOption arrowOption;
         arrowOption.rect = m_expansionArea.toRect();
         const QStyle::PrimitiveElement arrow = data()["isExpanded"].toBool()
@@ -147,8 +147,11 @@ void KFileItemListWidget::paint(QPainter* painter, const QStyleOptionGraphicsIte
     }
 
 #ifdef KFILEITEMLISTWIDGET_DEBUG
-    painter->setPen(Qt::red);
     painter->setBrush(Qt::NoBrush);
+    painter->setPen(Qt::green);
+    painter->drawRect(m_iconRect);
+
+    painter->setPen(Qt::red);
     painter->drawText(QPointF(0, itemListStyleOption.fontMetrics.height()), QString::number(index()));
     painter->drawRect(rect());
 #endif
@@ -169,7 +172,7 @@ QRectF KFileItemListWidget::textRect() const
 QRectF KFileItemListWidget::expansionToggleRect() const
 {
     const_cast<KFileItemListWidget*>(this)->triggerCacheRefreshing();
-    return m_isDir ? m_expansionArea : QRectF();
+    return m_isExpandable ? m_expansionArea : QRectF();
 }
 
 QRectF KFileItemListWidget::selectionToggleRect() const
@@ -405,7 +408,7 @@ void KFileItemListWidget::triggerCacheRefreshing()
     refreshCache();
 
     const QHash<QByteArray, QVariant> values = data();
-    m_isDir = values["isDir"].toBool();
+    m_isExpandable = values["isExpandable"].toBool();
     m_isHidden = values["name"].toString().startsWith(QLatin1Char('.'));
 
     updateExpansionArea();
@@ -424,15 +427,17 @@ void KFileItemListWidget::updateExpansionArea()
         Q_ASSERT(values.contains("expansionLevel"));
         const KItemListStyleOption& option = styleOption();
         const int expansionLevel = values.value("expansionLevel", 0).toInt();
-
-        const qreal widgetHeight = size().height();
-        const qreal expansionLevelSize = KIconLoader::SizeSmall;
-        const qreal x = option.margin + expansionLevel * widgetHeight;
-        const qreal y = (widgetHeight - expansionLevelSize) / 2;
-        m_expansionArea = QRectF(x, y, expansionLevelSize, expansionLevelSize);
-    } else {
-        m_expansionArea = QRectF();
+        if (expansionLevel >= 0) {
+            const qreal widgetHeight = size().height();
+            const qreal expansionLevelSize = KIconLoader::SizeSmall;
+            const qreal x = option.margin + expansionLevel * widgetHeight;
+            const qreal y = (widgetHeight - expansionLevelSize) / 2;
+            m_expansionArea = QRectF(x, y, expansionLevelSize, expansionLevelSize);
+            return;
+        }
     }
+
+    m_expansionArea = QRectF();
 }
 
 void KFileItemListWidget::updatePixmapCache()
@@ -492,16 +497,12 @@ void KFileItemListWidget::updatePixmapCache()
             squarePixmap.fill(Qt::transparent);
 
             QPainter painter(&squarePixmap);
-            int x, y;
-            if (iconOnTop) {
-                x = (iconHeight - m_pixmap.width()) / 2;  // Center horizontally
-                y = iconHeight - m_pixmap.height();       // Align on bottom
-                painter.drawPixmap(x, y, m_pixmap);
-            } else {
-                x = iconHeight - m_pixmap.width();        // Align right
-                y = (iconHeight - m_pixmap.height()) / 2; // Center vertically
-                painter.drawPixmap(x, y, m_pixmap);
+            const int x = (iconHeight - m_pixmap.width()) / 2;  // Center horizontally
+            int y = iconHeight - m_pixmap.height();             // Move to bottom
+            if (!iconOnTop) {
+                y /= 2.0;                                       // Center vertically
             }
+            painter.drawPixmap(x, y, m_pixmap);
 
             m_pixmap = squarePixmap;
         } else {
@@ -557,7 +558,12 @@ void KFileItemListWidget::updatePixmapCache()
         hoverHeight *= scaleFactor;
     }
     const qreal hoverX = m_pixmapPos.x() + (m_scaledPixmapSize.width() - hoverWidth) / 2.0;
-    const qreal hoverY = m_pixmapPos.y() + m_scaledPixmapSize.height() - hoverHeight;
+    qreal hoverY = m_scaledPixmapSize.height() - hoverHeight;
+    if (!iconOnTop) {
+        hoverY /= 2.0;
+    }
+    hoverY += m_pixmapPos.y();
+
     m_iconRect = QRectF(hoverX, hoverY, hoverWidth, hoverHeight);
     const qreal margin = option.margin;
     m_iconRect.adjust(-margin, -margin, margin, margin);
@@ -841,7 +847,7 @@ void KFileItemListWidget::drawPixmap(QPainter* painter, const QPixmap& pixmap)
         painter->drawPixmap(m_pixmapPos, scaledPixmap);
 
 #ifdef KFILEITEMLISTWIDGET_DEBUG
-        painter->setPen(Qt::green);
+        painter->setPen(Qt::blue);
         painter->drawRect(QRectF(m_pixmapPos, QSizeF(scaledPixmap.size())));
 #endif
     } else {