Respect text size for the width of the grid (this is just code for testing, the whole...

svn path=/trunk/KDE/kdebase/apps/; revision=638402

diff --git a/src/iconsviewsettingspage.cpp b/src/iconsviewsettingspage.cpp
index 67538c801e5cd95854410e99d96df7651bce1dbe..c1b0d51c32685055e678a7532103cf359bb5d52c 100644 (file)
--- a/src/iconsviewsettingspage.cpp
+++ b/src/iconsviewsettingspage.cpp
@@ -204,12 +204,13 @@ void IconsViewSettingsPage::applySettings()
     // width and height
     int gridWidth = defaultSize;
     int gridHeight = defaultSize;
     // width and height
     int gridWidth = defaultSize;
     int gridHeight = defaultSize;

+    const int textSizeIndex = m_textWidthBox->currentIndex();

     if (arrangement == QListView::TopToBottom) {
     if (arrangement == QListView::TopToBottom) {

-        gridWidth += 96;
+        gridWidth += 96 + textSizeIndex * 32;

         gridHeight += 64;
     }
     else {
         gridHeight += 64;
     }
     else {

-        gridWidth += 256;
+        gridWidth += 128 + textSizeIndex * 64;

     }
 
     settings->setGridWidth(gridWidth);
     }
 
     settings->setGridWidth(gridWidth);