X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/blobdiff_plain/d1aa2eb18029419e280942e91b665438c74c5a1d..123e5008ae1feba49a4a2d2ca5cf3bf97fda30ac:/src/klistview.cpp

diff --git a/src/klistview.cpp b/src/klistview.cpp
index 1971d7f98..fa78de638 100644
--- a/src/klistview.cpp
+++ b/src/klistview.cpp
@@ -120,7 +120,6 @@ const QModelIndexList &KListView::Private::intersectionSet(const QRect &rect)
         }
     }
 
-    int j = 0;
     for (int i = middle; i < proxyModel->rowCount(); i++)
     {
         index = elementDictionary[proxyModel->index(i, 0)];
@@ -131,10 +130,9 @@ const QModelIndexList &KListView::Private::intersectionSet(const QRect &rect)
 
         // If we passed next item, stop searching for hits
         if (qMax(rect.bottomRight().y(), rect.topLeft().y()) <
-                                                  indexVisualRect.topLeft().y())
+                                                  qMin(indexVisualRect.topLeft().y(),
+                                                       indexVisualRect.bottomRight().y()))
             break;
-
-        j++;
     }
 
     return intersectedIndexes;
@@ -333,8 +331,7 @@ void KListView::Private::drawNewCategory(const QString &category,
     opt.direction = option.direction;
     opt.text = category;
 
-    if (option.rect.contains(listView->viewport()->mapFromGlobal(QCursor::pos())) &&
-        !mouseButtonPressed)
+    if ((category == hoveredCategory) && !mouseButtonPressed)
     {
         const QPalette::ColorGroup group =
                                           option.state & QStyle::State_Enabled ?
@@ -398,10 +395,12 @@ void KListView::Private::drawDraggedItems(QPainter *painter)
 {
     QStyleOptionViewItemV3 option = listView->viewOptions();
     option.state &= ~QStyle::State_MouseOver;
+    int dx;
+    int dy;
     foreach (const QModelIndex &index, listView->selectionModel()->selectedIndexes())
     {
-        int dx = mousePosition.x() - initialPressPosition.x() + listView->horizontalOffset();
-        int dy = mousePosition.y() - initialPressPosition.y() + listView->verticalOffset();
+        dx = mousePosition.x() - initialPressPosition.x() + listView->horizontalOffset();
+        dy = mousePosition.y() - initialPressPosition.y() + listView->verticalOffset();
 
         option.rect = visualRect(index);
         option.rect.adjust(dx, dy, dx, dy);
@@ -547,7 +546,6 @@ void KListView::reset()
     d->elementDictionary.clear();
     d->categoriesIndexes.clear();
     d->categoriesPosition.clear();
-    d->isIndexSelected.clear();       // selection cache
     d->categories.clear();
     d->intersectedIndexes.clear();
     d->sourceModelIndexList.clear();
@@ -754,14 +752,10 @@ void KListView::setSelection(const QRect &rect,
     }
 
     selectionModel()->select(selection, flags);
-
-    viewport()->update();
 }
 
 void KListView::mouseMoveEvent(QMouseEvent *event)
 {
-    d->mousePosition = event->pos();
-
     QListView::mouseMoveEvent(event);
 
     if ((viewMode() != KListView::IconMode) || !d->proxyModel ||
@@ -770,9 +764,19 @@ void KListView::mouseMoveEvent(QMouseEvent *event)
         return;
     }
 
-    event->accept();
+    d->mousePosition = event->pos();
+    d->hoveredCategory = QString();
+
+    // Redraw categories
+    foreach (const QString &category, d->categories)
+    {
+        if (d->categoryVisualRect(category).intersects(QRect(event->pos(), event->pos())))
+        {
+            d->hoveredCategory = category;
+        }
 
-    viewport()->update();
+        viewport()->update(d->categoryVisualRect(category));
+    }
 }
 
 void KListView::mousePressEvent(QMouseEvent *event)
@@ -785,8 +789,6 @@ void KListView::mousePressEvent(QMouseEvent *event)
         return;
     }
 
-    event->accept();
-
     d->dragLeftViewport = false;
 
     if (event->button() == Qt::LeftButton)
@@ -799,8 +801,6 @@ void KListView::mousePressEvent(QMouseEvent *event)
         d->initialPressPosition.setX(d->initialPressPosition.x() +
                                                             horizontalOffset());
     }
-
-    viewport()->update();
 }
 
 void KListView::mouseReleaseEvent(QMouseEvent *event)
@@ -813,67 +813,52 @@ void KListView::mouseReleaseEvent(QMouseEvent *event)
         return;
     }
 
-    event->accept();
-
     d->mouseButtonPressed = false;
-    d->lastSelection = selectionModel()->selection();
 
     QPoint initialPressPosition = viewport()->mapFromGlobal(QCursor::pos());
     initialPressPosition.setY(initialPressPosition.y() + verticalOffset());
     initialPressPosition.setX(initialPressPosition.x() + horizontalOffset());
 
+    QItemSelection selection;
+
     if (initialPressPosition == d->initialPressPosition)
     {
-        QItemSelection selection;
         foreach(const QString &category, d->categories)
         {
             if (d->categoryVisualRect(category).contains(event->pos()))
             {
-                QModelIndex index;
-                foreach (const QModelIndex &mappedIndex,
-                         d->categoriesIndexes[category])
-                {
-                    index = d->proxyModel->mapFromSource(mappedIndex);
-
-                    if (d->isIndexSelected.contains(index))
-                    {
-                        if (!d->isIndexSelected[index])
-                            selection.select(index, index);
-
-                        d->isIndexSelected[index] = true;
-                    }
-                    else
-                    {
-                        d->isIndexSelected.insert(index, true);
-                        selection.select(index, index);
-                    }
-                }
-
-                selectionModel()->select(selection, QItemSelectionModel::Toggle);
+                QItemSelectionRange selectionRange(d->proxyModel->mapFromSource(d->categoriesIndexes[category][0]),
+                                                   d->proxyModel->mapFromSource(d->categoriesIndexes[category][d->categoriesIndexes[category].count() - 1]));
+
+                selection << selectionRange;
+
+                selectionModel()->select(selection, QItemSelectionModel::Select);
 
                 break;
             }
         }
     }
 
-    viewport()->update();
+    d->lastSelection = selectionModel()->selection();
+
+    if (d->hovered.isValid())
+        viewport()->update(d->visualRect(d->hovered));
+    else if (!d->hoveredCategory.isEmpty())
+        viewport()->update(d->categoryVisualRect(d->hoveredCategory));
 }
 
 void KListView::leaveEvent(QEvent *event)
 {
     QListView::leaveEvent(event);
 
-    d->hovered = QModelIndex();
-
     if ((viewMode() != KListView::IconMode) || !d->proxyModel ||
         !d->itemCategorizer)
     {
         return;
     }
 
-    event->accept();
-
-    viewport()->update();
+    d->hovered = QModelIndex();
+    d->hoveredCategory = QString();
 }
 
 void KListView::startDrag(Qt::DropActions supportedActions)
@@ -886,16 +871,15 @@ void KListView::startDrag(Qt::DropActions supportedActions)
 
 void KListView::dragMoveEvent(QDragMoveEvent *event)
 {
-    QListView::dragMoveEvent(event);
-
-    d->mousePosition = event->pos();
-
     if ((viewMode() != KListView::IconMode) || !d->proxyModel ||
         !d->itemCategorizer)
     {
+        QListView::dragMoveEvent(event);
         return;
     }
 
+    d->mousePosition = event->pos();
+
     if (d->mouseButtonPressed)
     {
         d->isDragging = true;
@@ -906,10 +890,6 @@ void KListView::dragMoveEvent(QDragMoveEvent *event)
     }
 
     d->dragLeftViewport = false;
-
-    event->accept();
-
-    viewport()->update();
 }
 
 void KListView::dragLeaveEvent(QDragLeaveEvent *event)
@@ -923,10 +903,18 @@ void KListView::dragLeaveEvent(QDragLeaveEvent *event)
     }
 
     d->dragLeftViewport = true;
+}
 
-    event->accept();
+QModelIndex KListView::moveCursor(CursorAction cursorAction,
+                                  Qt::KeyboardModifiers modifiers)
+{
+    if ((viewMode() != KListView::IconMode) || !d->proxyModel ||
+        !d->itemCategorizer)
+    {
+        return QListView::moveCursor(cursorAction, modifiers);
+    }
 
-    viewport()->update();
+    return QListView::moveCursor(cursorAction, modifiers);
 }
 
 void KListView::rowsInserted(const QModelIndex &parent,
@@ -948,12 +936,12 @@ void KListView::rowsInsertedArtifficial(const QModelIndex &parent,
                                         int start,
                                         int end)
 {
+    d->lastSelection = QItemSelection();
     d->elementsInfo.clear();
     d->elementsPosition.clear();
     d->elementDictionary.clear();
     d->categoriesIndexes.clear();
     d->categoriesPosition.clear();
-    d->isIndexSelected.clear();       // selection cache
     d->categories.clear();
     d->intersectedIndexes.clear();
     d->sourceModelIndexList.clear();
@@ -1052,7 +1040,8 @@ void KListView::rowsRemoved(const QModelIndex &parent,
                             int start,
                             int end)
 {
-    if (d->proxyModel)
+    if ((viewMode() == KListView::IconMode) && d->proxyModel &&
+        d->itemCategorizer)
     {
         // Force the view to update all elements
         rowsInsertedArtifficial(parent, start, end);