From 20b0cb68bf5cc1099fd6e61982817d9e2ae0130c Mon Sep 17 00:00:00 2001
From: Frank Reininghaus <frank78ac@googlemail.com>
Date: Thu, 6 Sep 2012 07:51:22 +0200
Subject: [PATCH] Do not show '-' for additional info which is not available
 for an item

Thanks to Todd Jennings for the patch!
CCBUG: 304752
REVIEW: 106304
---
 .../kitemviews/kstandarditemlistwidget.cpp    | 28 +++++++++++++++++--
 .../private/knepomukrolesprovider.cpp         |  7 -----
 2 files changed, 25 insertions(+), 10 deletions(-)

diff --git a/dolphin/src/kitemviews/kstandarditemlistwidget.cpp b/dolphin/src/kitemviews/kstandarditemlistwidget.cpp
index 7ae7e2efcf..be4fd68cbe 100644
--- a/dolphin/src/kitemviews/kstandarditemlistwidget.cpp
+++ b/dolphin/src/kitemviews/kstandarditemlistwidget.cpp
@@ -68,6 +68,14 @@ QSizeF KStandardItemListWidgetInformant::itemSizeHint(int index, const KItemList
         const qreal maxWidth = itemWidth - 2 * option.padding;
         QTextLine line;
 
+        int emptyRolesCount = 0;
+        foreach (const QByteArray& role, view->visibleRoles()) {
+            const QString text = roleText(role, values);
+            if (role != "text" && role != "rating" && text.isEmpty()) {
+                emptyRolesCount++;
+            }
+        }
+
         // Calculate the number of lines required for wrapping the name
         QTextOption textOption(Qt::AlignHCenter);
         textOption.setWrapMode(QTextOption::WrapAtWordBoundaryOrAnywhere);
@@ -84,7 +92,7 @@ QSizeF KStandardItemListWidgetInformant::itemSizeHint(int index, const KItemList
         layout.endLayout();
 
         // Add one line for each additional information
-        textHeight += additionalRolesCount * option.fontMetrics.lineSpacing();
+        textHeight += (additionalRolesCount - emptyRolesCount) * option.fontMetrics.lineSpacing();
 
         const qreal maxTextHeight = option.maxTextSize.height();
         if (maxTextHeight > 0 && textHeight > maxTextHeight) {
@@ -970,8 +978,17 @@ void KStandardItemListWidget::updateIconsLayoutTextCache()
     qreal nameHeight = 0;
     QTextLine line;
 
+    int emptyRolesCount = 0;
+    foreach (const QByteArray& role, visibleRoles()) {
+        const QString text = roleText(role, values);
+        if (role != "text" && role != "rating" && text.isEmpty()) {
+            emptyRolesCount++;
+        }
+    }
+
     const int additionalRolesCount = qMax(visibleRoles().count() - 1, 0);
-    const int maxNameLines = (option.maxTextSize.height() / int(lineSpacing)) - additionalRolesCount;
+    const int maxNameLines = (option.maxTextSize.height() / int(lineSpacing)) -
+                             (additionalRolesCount - emptyRolesCount);
 
     QTextLayout layout(nameTextInfo->staticText.text(), m_customizedFont);
     layout.setTextOption(nameTextInfo->staticText.textOption());
@@ -1005,7 +1022,7 @@ void KStandardItemListWidget::updateIconsLayoutTextCache()
     nameTextInfo->staticText.setTextWidth(maxWidth);
     nameTextInfo->pos = QPointF(padding, widgetHeight -
                                          nameHeight -
-                                         additionalRolesCount * lineSpacing -
+                                         (additionalRolesCount - emptyRolesCount)* lineSpacing -
                                          padding);
     m_textRect = QRectF(padding + (maxWidth - nameWidth) / 2,
                         nameTextInfo->pos.y(),
@@ -1020,6 +1037,11 @@ void KStandardItemListWidget::updateIconsLayoutTextCache()
         }
 
         const QString text = roleText(role, values);
+
+        if (role != "text" && role != "rating" && text.isEmpty()) {
+            continue;
+        }
+
         TextInfo* textInfo = m_textInfo.value(role);
         textInfo->staticText.setText(text);
 
diff --git a/dolphin/src/kitemviews/private/knepomukrolesprovider.cpp b/dolphin/src/kitemviews/private/knepomukrolesprovider.cpp
index 0ae9b6bd3e..b0e1798078 100644
--- a/dolphin/src/kitemviews/private/knepomukrolesprovider.cpp
+++ b/dolphin/src/kitemviews/private/knepomukrolesprovider.cpp
@@ -108,13 +108,6 @@ QHash<QByteArray, QVariant> KNepomukRolesProvider::roleValues(const Nepomuk::Res
         }
     }
 
-    // Assure that empty values get replaced by "-"
-    foreach (const QByteArray& role, roles) {
-        if (m_roles.contains(role) && values.value(role).toString().isEmpty()) {
-            values.insert(role, QLatin1String("-"));
-        }
-    }
-
     return values;
 }