From bac6ebe5d36ddb16daa1696fad2b9c0e9b220b3e Mon Sep 17 00:00:00 2001
From: Peter Penz <peter.penz19@gmail.com>
Date: Fri, 2 Jan 2009 09:04:16 +0000
Subject: [PATCH] Instead of increasing the grid spacing, increase the item
 size, so that there is more space for the text.

svn path=/trunk/KDE/kdebase/apps/; revision=904408
---
 src/dolphiniconsview.cpp | 45 +++++++++++++++++++---------------------
 1 file changed, 21 insertions(+), 24 deletions(-)

diff --git a/src/dolphiniconsview.cpp b/src/dolphiniconsview.cpp
index 6af32da9b1..4b886f2222 100644
--- a/src/dolphiniconsview.cpp
+++ b/src/dolphiniconsview.cpp
@@ -402,41 +402,38 @@ void DolphinIconsView::updateGridSize(bool showPreview, int additionalInfoCount)
     Q_ASSERT(additionalInfoCount >= 0);
     itemHeight += additionalInfoCount * m_font.pointSize() * 2;
 
-    const bool rowArrangement = (settings->arrangement() == QListView::TopToBottom);
-    if (rowArrangement) {
+    // optimize the item size of the grid in a way to prevent large gaps on the
+    // right border (= row arrangement) or the bottom border (= column arrangement)
+    const int spacing = settings->gridSpacing();
+    if (settings->arrangement() == QListView::TopToBottom) {
+        const int contentWidth = viewport()->width() - 1 -
+                                 style()->pixelMetric(QStyle::PM_ScrollBarExtent, 0, horizontalScrollBar());
+        const int gridWidth = itemWidth + spacing * 2;
+        const int horizItemCount = contentWidth / gridWidth;
+        if (horizItemCount > 0) {
+            itemWidth += (contentWidth - horizItemCount * gridWidth) / horizItemCount;
+        }
+
         // The decoration width indirectly defines the maximum
         // width for the text wrapping. To use the maximum item width
         // for text wrapping, it is used as decoration width.
         m_decorationSize = QSize(itemWidth, size);
         setIconSize(QSize(itemWidth, size));
     } else {
+        const int contentHeight = viewport()->height() - 1 -
+                                  style()->pixelMetric(QStyle::PM_ScrollBarExtent, 0, verticalScrollBar());
+        const int gridHeight = itemHeight + spacing;
+        const int vertItemCount = contentHeight / gridHeight;
+        if (vertItemCount > 0) {
+            itemHeight += (contentHeight - vertItemCount * gridHeight) / vertItemCount;
+        }
+
         m_decorationSize = QSize(size, size);
         setIconSize(QSize(size, size));
     }
 
     m_itemSize = QSize(itemWidth, itemHeight);
-
-    // optimize the spacing of the grid in a way to prevent large gaps on the
-    // right border (= row arrangement) or the bottom border (= column arrangement)
-    const int spacing = settings->gridSpacing();
-    int gridWidth = itemWidth + spacing * 2;
-    int gridHeight = itemHeight + spacing;
-    if (rowArrangement) {
-        const int contentWidth = viewport()->width() - 1 -
-                                 style()->pixelMetric(QStyle::PM_ScrollBarExtent, 0, horizontalScrollBar());
-        const int horizItemCount = contentWidth / gridWidth;
-        if (horizItemCount > 0) {
-            gridWidth += (contentWidth - horizItemCount * gridWidth) / horizItemCount;
-        }
-    } else {
-        const int contentHeight = viewport()->height() - 1 -
-                                  style()->pixelMetric(QStyle::PM_ScrollBarExtent, 0, verticalScrollBar());
-        const int vertItemCount = contentHeight / gridHeight;
-        if (vertItemCount > 0) {
-            gridHeight += (contentHeight - vertItemCount * gridHeight) / vertItemCount;
-        }
-    }
-    setGridSize(QSize(gridWidth, gridHeight));
+    setGridSize(QSize(itemWidth + spacing * 2, itemHeight + spacing));
 
     KFileItemDelegate* delegate = dynamic_cast<KFileItemDelegate*>(itemDelegate());
     if (delegate != 0) {