Fix small adjustments with items-categories

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

diff --git a/src/kcategorizedview.cpp b/src/kcategorizedview.cpp
index 8c1bcad51c5a6d4537d4479efa0ba08296cb89fc..214fa39d236ea23df61ed2ad273673df03b1f12a 100644 (file)
--- a/src/kcategorizedview.cpp
+++ b/src/kcategorizedview.cpp
@@ -201,20 +201,15 @@ QRect KCategorizedView::Private::visualRectInViewport(const QModelIndex &index)
 
         if (rows - trunc(rows)) rowsInt++;
 
+        retRect.setTop(retRect.top() +
+                       (rowsInt * itemHeight) +
+                       itemCategorizer->categoryHeight(listView->viewOptions()) +
+                       listView->spacing() * 2);
+
         if (listView->gridSize().isEmpty())
         {
             retRect.setTop(retRect.top() +
-                           (rowsInt * listView->spacing()) +
-                           (rowsInt * itemHeight) +
-                           itemCategorizer->categoryHeight(listView->viewOptions()) +
-                           listView->spacing() * 2);
-        }
-        else
-        {
-            retRect.setTop(retRect.top() +
-                           (rowsInt * itemHeight) +
-                           itemCategorizer->categoryHeight(listView->viewOptions()) +
-                           listView->spacing());
+                           (rowsInt * listView->spacing()));
         }
     }
 
@@ -290,20 +285,15 @@ QRect KCategorizedView::Private::visualCategoryRectInViewport(const QString &cat
 
         if (rows - trunc(rows)) rowsInt++;
 
+        retRect.setTop(retRect.top() +
+                       (rowsInt * itemHeight) +
+                       itemCategorizer->categoryHeight(listView->viewOptions()) +
+                       listView->spacing() * 2);
+
         if (listView->gridSize().isEmpty())
         {
             retRect.setTop(retRect.top() +
-                           (rowsInt * listView->spacing()) +
-                           (rowsInt * itemHeight) +
-                           itemCategorizer->categoryHeight(listView->viewOptions()) +
-                           listView->spacing() * 2);
-        }
-        else
-        {
-            retRect.setTop(retRect.top() +
-                           (rowsInt * itemHeight) +
-                           itemCategorizer->categoryHeight(listView->viewOptions()) +
-                           listView->spacing());
+                           (rowsInt * listView->spacing()));
         }
     }