Better drawing when big selection rect is drawn.

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

diff --git a/src/klistview.cpp b/src/klistview.cpp
index 403e984a295ce4b96d27392fa23d18d4367df30e..526fb8dfcdf94bca5201f63eb0b4be1e45aef825 100644 (file)
--- a/src/klistview.cpp
+++ b/src/klistview.cpp
@@ -637,19 +637,6 @@ void KListView::paintEvent(QPaintEvent *event)
         itemDelegate(index)->paint(&painter, option, index);
     }
 
         itemDelegate(index)->paint(&painter, option, index);
     }
 

-    // Redraw categories
-    QStyleOptionViewItem otherOption;
-    foreach (const QString &category, d->categories)
-    {
-        otherOption = option;
-        otherOption.rect = d->categoryVisualRect(category);
-
-        if (otherOption.rect.intersects(area))
-        {
-            d->drawNewCategory(category, otherOption, &painter);
-        }
-    }
-

     if (d->mouseButtonPressed && !d->isDragging)
     {
         QPoint start, end, initialPressPosition;
     if (d->mouseButtonPressed && !d->isDragging)
     {
         QPoint start, end, initialPressPosition;


@@ -681,6 +668,19 @@ void KListView::paintEvent(QPaintEvent *event)
         painter.restore();
     }
 
         painter.restore();
     }
 

+    // Redraw categories
+    QStyleOptionViewItem otherOption;
+    foreach (const QString &category, d->categories)
+    {
+        otherOption = option;
+        otherOption.rect = d->categoryVisualRect(category);
+
+        if (otherOption.rect.intersects(area))
+        {
+            d->drawNewCategory(category, otherOption, &painter);
+        }
+    }
+

     if (d->isDragging && !d->dragLeftViewport)
     {
         painter.setOpacity(0.5);
     if (d->isDragging && !d->dragLeftViewport)
     {
         painter.setOpacity(0.5);


@@ -801,6 +801,37 @@ void KListView::mouseMoveEvent(QMouseEvent *event)
 
         viewport()->update(d->categoryVisualRect(category));
     }
 
         viewport()->update(d->categoryVisualRect(category));
     }

+
+    QRect rect;
+    if (d->mouseButtonPressed && !d->isDragging)
+    {
+        QPoint start, end, initialPressPosition;
+
+        initialPressPosition = d->initialPressPosition;
+
+        initialPressPosition.setY(initialPressPosition.y() - verticalOffset());
+        initialPressPosition.setX(initialPressPosition.x() - horizontalOffset());
+
+        if (d->initialPressPosition.x() > d->mousePosition.x() ||
+            d->initialPressPosition.y() > d->mousePosition.y())
+        {
+            start = d->mousePosition;
+            end = initialPressPosition;
+        }
+        else
+        {
+            start = initialPressPosition;
+            end = d->mousePosition;
+        }
+
+        viewport()->update(d->lastSelectionRect);
+
+        rect = QRect(start, end).intersected(viewport()->rect().adjusted(-16, -16, 16, 16));
+
+        viewport()->update(rect);
+
+        d->lastSelectionRect = rect;
+    }

 }
 
 void KListView::mousePressEvent(QMouseEvent *event)
 }
 
 void KListView::mousePressEvent(QMouseEvent *event)

diff --git a/src/klistview_p.h b/src/klistview_p.h
index 11c0c3a6e83e425822ac1bb86519f4665dbe1d20..b590b23078969cfd00cbd6d412e490035e6a81e0 100644 (file)
--- a/src/klistview_p.h
+++ b/src/klistview_p.h
@@ -143,6 +143,7 @@ public:
     QStringList categories;
     QModelIndexList intersectedIndexes;
     QRect lastDraggedItemsRect;
     QStringList categories;
     QModelIndexList intersectedIndexes;
     QRect lastDraggedItemsRect;

+    QRect lastSelectionRect;

 
     // Attributes for speed reasons
     KSortFilterProxyModel *proxyModel;
 
     // Attributes for speed reasons
     KSortFilterProxyModel *proxyModel;