fix minor margin issue for the item boundaries

[dolphin.git] / src / dolphiniconsview.cpp

diff --git a/src/dolphiniconsview.cpp b/src/dolphiniconsview.cpp
index ed2593c97a0759e45f383d3ebe90af4dcda72ecb..ea553c8bee1b299f8943fe4a6d0990170c4bc39b 100644 (file)
--- a/src/dolphiniconsview.cpp
+++ b/src/dolphiniconsview.cpp
@@ -145,11 +145,10 @@ QRect DolphinIconsView::visualRect(const QModelIndex& index) const
         // name is too long. I'll try create a patch for Qt but as Dolphin must also work with
         // Qt 4.3.0 this workaround must get applied at least for KDE 4.0.
         const IconsModeSettings* settings = DolphinSettings::instance().iconsModeSettings();
-        const int margin = settings->gridSpacing() / 2;
+        const int margin = settings->gridSpacing();
         const int gridWidth = gridSize().width();
-        int left = itemRect.left();
-        left = ((left - margin + 1) / gridWidth) * gridWidth + margin;
-        itemRect.moveLeft(left);
+        const int gridIndex = (itemRect.left() - margin + 1) / gridWidth;
+        itemRect.moveLeft(gridIndex * gridWidth + margin);
     }
 
     return itemRect;
@@ -416,7 +415,7 @@ void DolphinIconsView::updateGridSize(bool showPreview, int additionalInfoCount)
     }
 
     const int spacing = settings->gridSpacing();
-    setGridSize(QSize(itemWidth + spacing, itemHeight + spacing));
+    setGridSize(QSize(itemWidth + spacing * 2, itemHeight + spacing));
 
     m_itemSize = QSize(itemWidth, itemHeight);