X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/blobdiff_plain/e92bbbe27ca39a1329ae3f2d6ecae128dd71855b..78195dd8fe00d69e4ee763c037b6890ad90fba73:/src/klistview.cpp

diff --git a/src/klistview.cpp b/src/klistview.cpp
index 1cba47b1b..4fe0f571f 100644
--- a/src/klistview.cpp
+++ b/src/klistview.cpp
@@ -21,7 +21,8 @@
 #include "klistview.h"
 #include "klistview_p.h"
 
-#include <math.h> // trunc
+#include <math.h> // trunc on C99 compliant systems
+#include <kdefakes.h> // trunc for not C99 compliant systems
 
 #include <QApplication>
 #include <QPainter>
@@ -385,6 +386,9 @@ void KListView::Private::updateScrollbars()
 {
     int lastItemBottom = cachedRectIndex(lastIndex).bottom() +
                            listView->spacing() - listView->viewport()->height();
+
+    listView->verticalScrollBar()->setSingleStep(listView->viewport()->height() / 10);
+    listView->verticalScrollBar()->setPageStep(listView->viewport()->height());
     listView->verticalScrollBar()->setRange(0, lastItemBottom);
 }
 
@@ -482,6 +486,10 @@ void KListView::setItemCategorizer(KItemCategorizer *itemCategorizer)
     {
         rowsInserted(QModelIndex(), 0, d->proxyModel->rowCount() - 1);
     }
+    else
+    {
+        updateGeometries();
+    }
 }
 
 QModelIndex KListView::indexAt(const QPoint &point) const
@@ -521,6 +529,7 @@ 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();
@@ -662,39 +671,83 @@ void KListView::setSelection(const QRect &rect,
         return;
     }
 
-    // FIXME: I have to rethink and rewrite this method (ereslibre)
+    if (flags & QItemSelectionModel::Clear)
+    {
+        selectionModel()->clear();
+        d->isIndexSelected.clear();
+        d->isTemporarySelected.clear();
+    }
 
+    QItemSelection selection;
     QModelIndexList dirtyIndexes = d->intersectionSet(rect);
     foreach (const QModelIndex &index, dirtyIndexes)
     {
         if (!d->mouseButtonPressed && rect.intersects(visualRect(index)))
         {
-            selectionModel()->select(index, flags);
+            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);
+            }
         }
-        else
+        else if (d->mouseButtonPressed)           // selection cache
         {
-            selectionModel()->select(index, QItemSelectionModel::Select);
+            if (!d->isIndexSelected.contains(index) ||
+                (d->isIndexSelected.contains(index) && !d->isIndexSelected[index]))
+            {
+                if (d->isTemporarySelected.contains(index))
+                {
+                    d->isTemporarySelected[index] = true;
+                }
+                else
+                {
+                    d->isTemporarySelected.insert(index, true);
+                }
+            }
+
+            if (d->isIndexSelected.contains(index))
+            {
+                if (!d->isIndexSelected[index])
+                    selection.select(index, index);
 
-            if (d->mouseButtonPressed)
-                d->tempSelected.append(index);
+                d->isIndexSelected[index] = true;
+            }
+            else
+            {
+                d->isIndexSelected.insert(index, true);
+                selection.select(index, index);
+            }
         }
     }
 
-    if (d->mouseButtonPressed)
+    QItemSelection deselect;
+
+    foreach (const QModelIndex &index, d->isIndexSelected.keys())
     {
-        foreach (const QModelIndex &index, selectionModel()->selectedIndexes())
+        if (!rect.intersects(visualRect(index)))
         {
-            if (!rect.intersects(visualRect(index)))
+            if (d->isTemporarySelected.contains(index) &&
+                d->isTemporarySelected[index])
             {
-                selectionModel()->select(index, QItemSelectionModel::Deselect);
-
-                if (d->mouseButtonPressed)
-                {
-                    d->tempSelected.removeAll(index);
-                }
+                deselect.select(index, index);
+                d->isTemporarySelected[index] = false;
+                d->isIndexSelected[index] = false;
             }
         }
     }
+
+    if (selection.count())
+        selectionModel()->select(selection, QItemSelectionModel::Select);
+
+    if (deselect.count())
+        selectionModel()->select(deselect, QItemSelectionModel::Deselect);
 }
 
 void KListView::mouseMoveEvent(QMouseEvent *event)
@@ -718,8 +771,6 @@ void KListView::mousePressEvent(QMouseEvent *event)
 {
     QListView::mousePressEvent(event);
 
-    d->tempSelected.clear();
-
     if ((viewMode() == KListView::ListMode) || !d->proxyModel ||
         !d->itemCategorizer)
     {
@@ -756,7 +807,7 @@ void KListView::mouseReleaseEvent(QMouseEvent *event)
 
     event->accept();
 
-    // FIXME: I have to rethink and rewrite this method (ereslibre)
+    d->isTemporarySelected.clear();     // selection cache
 
     QPoint initialPressPosition = viewport()->mapFromGlobal(QCursor::pos());
     initialPressPosition.setY(initialPressPosition.y() + verticalOffset());
@@ -764,28 +815,23 @@ void KListView::mouseReleaseEvent(QMouseEvent *event)
 
     if (initialPressPosition == d->initialPressPosition)
     {
+        QItemSelection selection;
         foreach(const QString &category, d->categories)
         {
             if (d->categoryVisualRect(category).contains(event->pos()))
             {
                 QModelIndex index;
-                QItemSelectionModel::SelectionFlag flag;
                 foreach (const QModelIndex &mappedIndex,
                          d->categoriesIndexes[category])
                 {
                     index = d->proxyModel->mapFromSource(mappedIndex);
 
-                    if (selectionModel()->selectedIndexes().contains(index))
-                    {
-                        flag = QItemSelectionModel::Deselect;
-                    }
-                    else
-                    {
-                        flag = QItemSelectionModel::Select;
-                    }
-
-                    selectionModel()->select(index, flag);
+                    selection.select(index, index);
                 }
+
+                selectionModel()->select(selection, QItemSelectionModel::Toggle);
+
+                break;
             }
         }
     }
@@ -810,6 +856,13 @@ void KListView::leaveEvent(QEvent *event)
     viewport()->update();
 }
 
+void KListView::startDrag(Qt::DropActions supportedActions)
+{
+    d->mouseButtonPressed = false;
+
+    QListView::startDrag(supportedActions);
+}
+
 void KListView::rowsInserted(const QModelIndex &parent,
                              int start,
                              int end)
@@ -834,6 +887,7 @@ void KListView::rowsInsertedArtifficial(const QModelIndex &parent,
     d->elementDictionary.clear();
     d->categoriesIndexes.clear();
     d->categoriesPosition.clear();
+    d->isIndexSelected.clear();       // selection cache
     d->categories.clear();
     d->intersectedIndexes.clear();
     d->sourceModelIndexList.clear();
@@ -955,11 +1009,11 @@ void KListView::updateGeometries()
 
 void KListView::slotSortingRoleChanged()
 {
-    if (d->proxyModel)
+    if ((viewMode() == KListView::IconMode) && d->proxyModel &&
+        d->itemCategorizer)
     {
         // Force the view to update all elements
-        rowsInsertedArtifficial(QModelIndex(), 0, d->proxyModel->rowCount() -
-                                                                             1);
+        rowsInsertedArtifficial(QModelIndex(), 0, d->proxyModel->rowCount() - 1);
     }
 }