Faster selections

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

diff --git a/src/klistview.cpp b/src/klistview.cpp
index 206853530efcede4ada4e890d2dc90fda9273351..0c550f4866204b0bb5ad03e2131203d6981ce555 100644 (file)
--- a/src/klistview.cpp
+++ b/src/klistview.cpp
@@ -80,6 +80,7 @@ KListView::Private::Private(KListView *listView)
     , itemCategorizer(0)
     , mouseButtonPressed(false)
     , isDragging(false)
+    , dragLeftViewport(false)
     , proxyModel(0)
     , lastIndex(QModelIndex())
 {
@@ -658,7 +659,7 @@ void KListView::paintEvent(QPaintEvent *event)
         painter.restore();
     }
 
-    if (d->isDragging)
+    if (d->isDragging && !d->dragLeftViewport)
         d->drawDraggedItems(&painter);
 
     painter.restore();
@@ -691,96 +692,75 @@ void KListView::setSelection(const QRect &rect,
         return;
     }
 
+    if (!flags)
+        return;
+
+    selectionModel()->clear();
+
     if (flags & QItemSelectionModel::Clear)
     {
-        selectionModel()->clear();
-        d->isIndexSelected.clear();
-        d->isTemporarySelected.clear();
+        d->lastSelection = QItemSelection();
     }
 
-    QItemSelection selection;
-    QItemSelection deselect;
     QModelIndexList dirtyIndexes = d->intersectionSet(rect);
-    foreach (const QModelIndex &index, dirtyIndexes)
+    QItemSelection selection;
+
+    if (!dirtyIndexes.count())
     {
-        if (!d->mouseButtonPressed && rect.intersects(visualRect(index)))
+        if (d->lastSelection.count())
         {
-            if (d->isIndexSelected.contains(index))
-            {
-                if (!d->isIndexSelected[index])
-                {
-                    selection.select(index, index);
-                    d->isIndexSelected[index] = true;
-                }
-                else
-                {
-                    deselect.select(index, index);
-                    d->isIndexSelected[index] = false;
-                }
-            }
-            else
-            {
-                d->isIndexSelected.insert(index, true);
-                selection.select(index, index);
-            }
+            selectionModel()->select(d->lastSelection, flags);
         }
-        else if (d->mouseButtonPressed)           // selection cache
+
+        return;
+    }
+
+    if (!d->mouseButtonPressed)
+    {
+        selection = QItemSelection(dirtyIndexes[0], dirtyIndexes[0]);
+    }
+    else
+    {
+        QModelIndex first = dirtyIndexes[0];
+        QModelIndex last;
+        foreach (const QModelIndex &index, dirtyIndexes)
         {
-            if (!d->isIndexSelected.contains(index) ||
-                (d->isIndexSelected.contains(index) && !d->isIndexSelected[index]))
+            if (last.isValid() && last.row() + 1 != index.row())
             {
-                if (d->isTemporarySelected.contains(index))
-                {
-                    d->isTemporarySelected[index] = true;
-                }
-                else
-                {
-                    d->isTemporarySelected.insert(index, true);
-                }
-            }
+                QItemSelectionRange range(first, last);
 
-            if (d->isIndexSelected.contains(index))
-            {
-                if (!d->isIndexSelected[index])
-                    selection.select(index, index);
+                selection << range;
 
-                d->isIndexSelected[index] = true;
-            }
-            else
-            {
-                d->isIndexSelected.insert(index, true);
-                selection.select(index, index);
+                first = index;
             }
+
+            last = index;
         }
+
+        if (last.isValid())
+            selection << QItemSelectionRange(first, last);
     }
 
-    foreach (const QModelIndex &index, d->isIndexSelected.keys())
+    if (d->lastSelection.count() && !d->mouseButtonPressed)
     {
-        if (!rect.intersects(visualRect(index)))
-        {
-            if (d->isTemporarySelected.contains(index) &&
-                d->isTemporarySelected[index])
-            {
-                deselect.select(index, index);
-                d->isTemporarySelected[index] = false;
-                d->isIndexSelected[index] = false;
-            }
-        }
+        selection.merge(d->lastSelection, flags);
+    }
+    else if (d->lastSelection.count())
+    {
+        selection.merge(d->lastSelection, QItemSelectionModel::Select);
     }
 
-    if (selection.count())
-        selectionModel()->select(selection, QItemSelectionModel::Select);
+    selectionModel()->select(selection, flags);
 
-    if (deselect.count())
-        selectionModel()->select(deselect, QItemSelectionModel::Deselect);
+    viewport()->update();
 }
 
 void KListView::mouseMoveEvent(QMouseEvent *event)
 {
-    QListView::mouseMoveEvent(event);
-
     d->mousePosition = event->pos();
 
+    QListView::mouseMoveEvent(event);
+
     if ((viewMode() != KListView::IconMode) || !d->proxyModel ||
         !d->itemCategorizer)
     {
@@ -804,6 +784,8 @@ void KListView::mousePressEvent(QMouseEvent *event)
 
     event->accept();
 
+    d->dragLeftViewport = false;
+
     if (event->button() == Qt::LeftButton)
     {
         d->mouseButtonPressed = true;
@@ -822,8 +804,6 @@ void KListView::mouseReleaseEvent(QMouseEvent *event)
 {
     QListView::mouseReleaseEvent(event);
 
-    d->mouseButtonPressed = false;
-
     if ((viewMode() != KListView::IconMode) || !d->proxyModel ||
         !d->itemCategorizer)
     {
@@ -832,7 +812,8 @@ void KListView::mouseReleaseEvent(QMouseEvent *event)
 
     event->accept();
 
-    d->isTemporarySelected.clear();     // selection cache
+    d->mouseButtonPressed = false;
+    d->lastSelection = selectionModel()->selection();
 
     QPoint initialPressPosition = viewport()->mapFromGlobal(QCursor::pos());
     initialPressPosition.setY(initialPressPosition.y() + verticalOffset());
@@ -921,6 +902,25 @@ void KListView::dragMoveEvent(QDragMoveEvent *event)
         d->isDragging = false;
     }
 
+    d->dragLeftViewport = false;
+
+    event->accept();
+
+    viewport()->update();
+}
+
+void KListView::dragLeaveEvent(QDragLeaveEvent *event)
+{
+    QListView::dragLeaveEvent(event);
+
+    if ((viewMode() != KListView::IconMode) || !d->proxyModel ||
+        !d->itemCategorizer)
+    {
+        return;
+    }
+
+    d->dragLeftViewport = true;
+
     event->accept();
 
     viewport()->update();

diff --git a/src/klistview.h b/src/klistview.h
index 1ef6feed4564ef5b576c053ba81c7ab045d0362a..fc9599111e2781572a09de1f48449326b4e8666d 100644 (file)
--- a/src/klistview.h
+++ b/src/klistview.h
@@ -70,6 +70,8 @@ protected:
 
     virtual void dragMoveEvent(QDragMoveEvent *event);
 
+    virtual void dragLeaveEvent(QDragLeaveEvent *event);
+
 protected Q_SLOTS:
     virtual void rowsInserted(const QModelIndex &parent,
                               int start,

diff --git a/src/klistview_p.h b/src/klistview_p.h
index d8f12a512a091e98b0ceeff82790602bdc113eef..3c960310f170645a65d0a49ca9c103a9e7e3a176 100644 (file)
--- a/src/klistview_p.h
+++ b/src/klistview_p.h
@@ -119,9 +119,11 @@ public:
     // Behavior data
     bool mouseButtonPressed;
     bool isDragging;
+    bool dragLeftViewport;
     QModelIndex hovered;
     QPoint initialPressPosition;
     QPoint mousePosition;
+    QItemSelection lastSelection;
 
     // Cache data
     // We cannot merge some of them into structs because it would affect
@@ -134,7 +136,6 @@ public:
     QStringList categories;
     QModelIndexList intersectedIndexes;
     QHash<QModelIndex, bool> isIndexSelected;            // selection cache
-    QHash<QModelIndex, bool> isTemporarySelected;        // selection cache
 
     // Attributes for speed reasons
     KSortFilterProxyModel *proxyModel;