If we have different heights on the same row, make it possible to update taller items...

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

diff --git a/src/kcategorizedview.cpp b/src/kcategorizedview.cpp
index 3255de9a49b3db3d8838942b0a1cf8241534590b..cc83e2de9633c5a38eaf8049794ffd81923e8963 100644 (file)
--- a/src/kcategorizedview.cpp
+++ b/src/kcategorizedview.cpp
@@ -98,6 +98,17 @@ const QModelIndexList &KCategorizedView::Private::intersectionSet(const QRect &r
 
     intersectedIndexes.clear();
 
 
     intersectedIndexes.clear();
 

+    int itemHeight;
+
+    if (listView->gridSize().isEmpty())
+    {
+        itemHeight = biggestItemSize.height();
+    }
+    else
+    {
+        itemHeight = listView->gridSize().height();
+    }
+

     // Lets find out where we should start
     int top = proxyModel->rowCount() - 1;
     int bottom = 0;
     // Lets find out where we should start
     int top = proxyModel->rowCount() - 1;
     int bottom = 0;


@@ -108,10 +119,13 @@ const QModelIndexList &KCategorizedView::Private::intersectionSet(const QRect &r
 
         index = elementDictionary[proxyModel->index(middle, 0)];
         indexVisualRect = visualRect(index);
 
         index = elementDictionary[proxyModel->index(middle, 0)];
         indexVisualRect = visualRect(index);

+        // We need the whole height (not only the visualRect). This will help us to update
+        // all needed indexes correctly (ereslibre)
+        indexVisualRect.setHeight(indexVisualRect.height() + (itemHeight - indexVisualRect.height()));

 
         if (qMax(indexVisualRect.topLeft().y(),
                  indexVisualRect.bottomRight().y()) < qMin(rect.topLeft().y(),
 
         if (qMax(indexVisualRect.topLeft().y(),
                  indexVisualRect.bottomRight().y()) < qMin(rect.topLeft().y(),

-                                                        rect.bottomRight().y()))
+                                                           rect.bottomRight().y()))

         {
             bottom = middle + 1;
         }
         {
             bottom = middle + 1;
         }