Draw dragged items. Better conditions (more accurate to our behavior, hey ! we have...

[dolphin.git] / src / klistview.cpp

diff --git a/src/klistview.cpp b/src/klistview.cpp
index 1cba47b1bd44c2c8e785beaa0f5b03bf359a3d4f..df8150a11c2bf9ff233a244f0dc46f55ae04a546 100644 (file)
--- 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>
@@ -78,6 +79,7 @@ KListView::Private::Private(KListView *listView)
     : listView(listView)
     , itemCategorizer(0)
     , mouseButtonPressed(false)
+    , isDragging(false)
     , proxyModel(0)
     , lastIndex(QModelIndex())
 {
@@ -385,9 +387,28 @@ 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);
 }
 
+void KListView::Private::drawDraggedItems(QPainter *painter)
+{
+    QStyleOptionViewItemV3 option = listView->viewOptions();
+    option.state &= ~QStyle::State_MouseOver;
+    foreach (const QModelIndex &index, listView->selectionModel()->selectedIndexes())
+    {
+        int dx = mousePosition.x() - initialPressPosition.x();
+        int dy = mousePosition.y() - initialPressPosition.y();
+
+        option.rect = visualRect(index);
+        option.rect.adjust(dx, dy, dx, dy);
+
+        listView->itemDelegate(index)->paint(painter, option, index);
+    }
+}
+
 
 //==============================================================================
 
@@ -434,7 +455,7 @@ void KListView::setModel(QAbstractItemModel *model)
 
 QRect KListView::visualRect(const QModelIndex &index) const
 {
-    if ((viewMode() == KListView::ListMode) || !d->proxyModel ||
+    if ((viewMode() != KListView::IconMode) || !d->proxyModel ||
         !d->itemCategorizer)
     {
         return QListView::visualRect(index);
@@ -482,11 +503,15 @@ void KListView::setItemCategorizer(KItemCategorizer *itemCategorizer)
     {
         rowsInserted(QModelIndex(), 0, d->proxyModel->rowCount() - 1);
     }
+    else
+    {
+        updateGeometries();
+    }
 }
 
 QModelIndex KListView::indexAt(const QPoint &point) const
 {
-    if ((viewMode() == KListView::ListMode) || !d->proxyModel ||
+    if ((viewMode() != KListView::IconMode) || !d->proxyModel ||
         !d->itemCategorizer)
     {
         return QListView::indexAt(point);
@@ -510,7 +535,7 @@ void KListView::reset()
 {
     QListView::reset();
 
-    if ((viewMode() == KListView::ListMode) || !d->proxyModel ||
+    if ((viewMode() != KListView::IconMode) || !d->proxyModel ||
         !d->itemCategorizer)
     {
         return;
@@ -521,6 +546,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();
@@ -530,7 +556,7 @@ void KListView::reset()
 
 void KListView::paintEvent(QPaintEvent *event)
 {
-    if ((viewMode() == KListView::ListMode) || !d->proxyModel ||
+    if ((viewMode() != KListView::IconMode) || !d->proxyModel ||
         !d->itemCategorizer)
     {
         QListView::paintEvent(event);
@@ -601,7 +627,7 @@ void KListView::paintEvent(QPaintEvent *event)
         }
     }
 
-    if (d->mouseButtonPressed)
+    if (d->mouseButtonPressed && !d->isDragging)
     {
         QPoint start, end, initialPressPosition;
 
@@ -632,6 +658,9 @@ void KListView::paintEvent(QPaintEvent *event)
         painter.restore();
     }
 
+    if (d->isDragging)
+        d->drawDraggedItems(&painter);
+
     painter.restore();
 }
 
@@ -639,7 +668,7 @@ void KListView::resizeEvent(QResizeEvent *event)
 {
     QListView::resizeEvent(event);
 
-    if ((viewMode() == KListView::ListMode) || !d->proxyModel ||
+    if ((viewMode() != KListView::IconMode) || !d->proxyModel ||
         !d->itemCategorizer)
     {
         return;
@@ -655,46 +684,90 @@ void KListView::resizeEvent(QResizeEvent *event)
 void KListView::setSelection(const QRect &rect,
                              QItemSelectionModel::SelectionFlags flags)
 {
-    if ((viewMode() == KListView::ListMode) || !d->proxyModel ||
+    if ((viewMode() != KListView::IconMode) || !d->proxyModel ||
         !d->itemCategorizer)
     {
         QListView::setSelection(rect, flags);
         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->mouseButtonPressed)
-                d->tempSelected.append(index);
+            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);
+            }
         }
     }
 
-    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)
@@ -703,7 +776,7 @@ void KListView::mouseMoveEvent(QMouseEvent *event)
 
     d->mousePosition = event->pos();
 
-    if ((viewMode() == KListView::ListMode) || !d->proxyModel ||
+    if ((viewMode() != KListView::IconMode) || !d->proxyModel ||
         !d->itemCategorizer)
     {
         return;
@@ -718,9 +791,7 @@ void KListView::mousePressEvent(QMouseEvent *event)
 {
     QListView::mousePressEvent(event);
 
-    d->tempSelected.clear();
-
-    if ((viewMode() == KListView::ListMode) || !d->proxyModel ||
+    if ((viewMode() != KListView::IconMode) || !d->proxyModel ||
         !d->itemCategorizer)
     {
         return;
@@ -748,7 +819,7 @@ void KListView::mouseReleaseEvent(QMouseEvent *event)
 
     d->mouseButtonPressed = false;
 
-    if ((viewMode() == KListView::ListMode) || !d->proxyModel ||
+    if ((viewMode() != KListView::IconMode) || !d->proxyModel ||
         !d->itemCategorizer)
     {
         return;
@@ -756,7 +827,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 +835,34 @@ 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))
+                    if (d->isIndexSelected.contains(index))
                     {
-                        flag = QItemSelectionModel::Deselect;
+                        if (!d->isIndexSelected[index])
+                            selection.select(index, index);
+
+                        d->isIndexSelected[index] = true;
                     }
                     else
                     {
-                        flag = QItemSelectionModel::Select;
+                        d->isIndexSelected.insert(index, true);
+                        selection.select(index, index);
                     }
-
-                    selectionModel()->select(index, flag);
                 }
+
+                selectionModel()->select(selection, QItemSelectionModel::Toggle);
+
+                break;
             }
         }
     }
@@ -799,12 +876,46 @@ void KListView::leaveEvent(QEvent *event)
 
     d->hovered = QModelIndex();
 
-    if ((viewMode() == KListView::ListMode) || !d->proxyModel ||
+    if ((viewMode() != KListView::IconMode) || !d->proxyModel ||
+        !d->itemCategorizer)
+    {
+        return;
+    }
+
+    event->accept();
+
+    viewport()->update();
+}
+
+void KListView::startDrag(Qt::DropActions supportedActions)
+{
+    QListView::startDrag(supportedActions);
+
+    d->isDragging = false;
+    d->mouseButtonPressed = false;
+}
+
+void KListView::dragMoveEvent(QDragMoveEvent *event)
+{
+    QListView::dragMoveEvent(event);
+
+    d->mousePosition = event->pos();
+
+    if ((viewMode() != KListView::IconMode) || !d->proxyModel ||
         !d->itemCategorizer)
     {
         return;
     }
 
+    if (d->mouseButtonPressed)
+    {
+        d->isDragging = true;
+    }
+    else
+    {
+        d->isDragging = false;
+    }
+
     event->accept();
 
     viewport()->update();
@@ -816,7 +927,7 @@ void KListView::rowsInserted(const QModelIndex &parent,
 {
     QListView::rowsInserted(parent, start, end);
 
-    if ((viewMode() == KListView::ListMode) || !d->proxyModel ||
+    if ((viewMode() != KListView::IconMode) || !d->proxyModel ||
         !d->itemCategorizer)
     {
         return;
@@ -826,14 +937,15 @@ void KListView::rowsInserted(const QModelIndex &parent,
 }
 
 void KListView::rowsInsertedArtifficial(const QModelIndex &parent,
-                                                int start,
-                                                int end)
+                                        int start,
+                                        int end)
 {
     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();
@@ -941,7 +1053,7 @@ void KListView::rowsRemoved(const QModelIndex &parent,
 
 void KListView::updateGeometries()
 {
-    if ((viewMode() == KListView::ListMode) || !d->proxyModel ||
+    if ((viewMode() != KListView::IconMode) || !d->proxyModel ||
         !d->itemCategorizer)
     {
         QListView::updateGeometries();
@@ -955,11 +1067,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);
     }
 }