X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/blobdiff_plain/2f0ceedae088158b8af24a5e94500a7d1c0edecb..84010807786c352aaeb2320caf27e5f9048d8dec:/src/kitemviews/kitemlistcontroller.cpp

diff --git a/src/kitemviews/kitemlistcontroller.cpp b/src/kitemviews/kitemlistcontroller.cpp
index 92a14b23d..c3f3b36f4 100644
--- a/src/kitemviews/kitemlistcontroller.cpp
+++ b/src/kitemviews/kitemlistcontroller.cpp
@@ -27,18 +27,23 @@
 #include "kitemlistselectionmanager.h"
 
 #include <QApplication>
+#include <QDrag>
 #include <QEvent>
 #include <QGraphicsSceneEvent>
+#include <QMimeData>
 
 #include <KDebug>
 
 KItemListController::KItemListController(QObject* parent) :
     QObject(parent),
+    m_dragging(false),
     m_selectionBehavior(NoSelection),
     m_model(0),
     m_view(0),
     m_selectionManager(new KItemListSelectionManager(this)),
-    m_pressedIndex(-1)
+    m_pressedIndex(-1),
+    m_pressedMousePos(),
+    m_oldSelection()
 {
 }
 
@@ -233,10 +238,10 @@ bool KItemListController::mousePressEvent(QGraphicsSceneMouseEvent* event, const
         return false;
     }
 
-    const QPointF pos = transform.map(event->pos());
-    m_pressedIndex = m_view->itemAt(pos);
+    m_pressedMousePos = transform.map(event->pos());
+    m_pressedIndex = m_view->itemAt(m_pressedMousePos);
 
-    if (m_view->isAboveExpansionToggle(m_pressedIndex, pos)) {
+    if (m_view->isAboveExpansionToggle(m_pressedIndex, m_pressedMousePos)) {
         return true;
     }
 
@@ -283,7 +288,7 @@ bool KItemListController::mousePressEvent(QGraphicsSceneMouseEvent* event, const
         return true;
     } else {
         KItemListRubberBand* rubberBand = m_view->rubberBand();
-        QPointF startPos = pos;
+        QPointF startPos = m_pressedMousePos;
         if (m_view->scrollOrientation() == Qt::Vertical) {
             startPos.ry() += m_view->offset();
             if (m_view->itemSize().width() < 0) {
@@ -294,6 +299,8 @@ bool KItemListController::mousePressEvent(QGraphicsSceneMouseEvent* event, const
         } else {
             startPos.rx() += m_view->offset();
         }
+
+        m_oldSelection = m_selectionManager->selectedItems();
         rubberBand->setStartPosition(startPos);
         rubberBand->setEndPosition(startPos);
         rubberBand->setActive(true);
@@ -309,20 +316,33 @@ bool KItemListController::mouseMoveEvent(QGraphicsSceneMouseEvent* event, const
         return false;
     }
 
-    KItemListRubberBand* rubberBand = m_view->rubberBand();
-    if (rubberBand->isActive()) {
-        QPointF endPos = transform.map(event->pos());
-        if (m_view->scrollOrientation() == Qt::Vertical) {
-            endPos.ry() += m_view->offset();
-            if (m_view->itemSize().width() < 0) {
-                // Use a special rubberband for views that have only one column and
-                // expand the rubberband to use the whole width of the view.
-                endPos.setX(m_view->size().width());
+    if (m_pressedIndex >= 0) {
+        // Check whether a dragging should be started
+        if (!m_dragging) {
+            const QPointF pos = transform.map(event->pos());
+            const qreal minDragDiff = 4;
+            m_dragging = qAbs(pos.x() - m_pressedMousePos.x()) >= minDragDiff ||
+                         qAbs(pos.y() - m_pressedMousePos.y()) >= minDragDiff;
+            if (m_dragging) {
+                startDragging();
             }
-        } else {
-            endPos.rx() += m_view->offset();
         }
-        rubberBand->setEndPosition(endPos);
+    } else {
+        KItemListRubberBand* rubberBand = m_view->rubberBand();
+        if (rubberBand->isActive()) {
+            QPointF endPos = transform.map(event->pos());
+            if (m_view->scrollOrientation() == Qt::Vertical) {
+                endPos.ry() += m_view->offset();
+                if (m_view->itemSize().width() < 0) {
+                    // Use a special rubberband for views that have only one column and
+                    // expand the rubberband to use the whole width of the view.
+                    endPos.setX(m_view->size().width());
+                }
+            } else {
+                endPos.rx() += m_view->offset();
+            }
+            rubberBand->setEndPosition(endPos);
+        }
     }
 
     return false;
@@ -338,35 +358,36 @@ bool KItemListController::mouseReleaseEvent(QGraphicsSceneMouseEvent* event, con
     if (rubberBand->isActive()) {
         disconnect(rubberBand, SIGNAL(endPositionChanged(QPointF,QPointF)), this, SLOT(slotRubberBandChanged()));
         rubberBand->setActive(false);
-        m_pressedIndex = -1;
-        return false;
-    }
-
-    const QPointF pos = transform.map(event->pos());
-    const int index = m_view->itemAt(pos);
-    const bool shiftOrControlPressed = event->modifiers() & Qt::ShiftModifier || event->modifiers() & Qt::ControlModifier;
-
-    if (index >= 0 && index == m_pressedIndex) {
-        // The release event is done above the same item as the press event
-        bool emitItemClicked = true;
-        if (event->button() & Qt::LeftButton) {
-            if (m_view->isAboveExpansionToggle(index, pos)) {
-                emit itemExpansionToggleClicked(index);
-                emitItemClicked = false;
-            }
-            else if (shiftOrControlPressed) {
-                // The mouse click should only update the selection, not trigger the item
-                emitItemClicked = false;
+        m_oldSelection.clear();
+    } else {
+        const QPointF pos = transform.map(event->pos());
+        const int index = m_view->itemAt(pos);
+        const bool shiftOrControlPressed = event->modifiers() & Qt::ShiftModifier ||
+                                           event->modifiers() & Qt::ControlModifier;
+
+        if (index >= 0 && index == m_pressedIndex) {
+            // The release event is done above the same item as the press event
+            bool emitItemClicked = true;
+            if (event->button() & Qt::LeftButton) {
+                if (m_view->isAboveExpansionToggle(index, pos)) {
+                    emit itemExpansionToggleClicked(index);
+                    emitItemClicked = false;
+                } else if (shiftOrControlPressed) {
+                    // The mouse click should only update the selection, not trigger the item
+                    emitItemClicked = false;
+                }
             }
-        }
 
-        if (emitItemClicked) {
-            emit itemClicked(index, event->button());
+            if (emitItemClicked) {
+                emit itemClicked(index, event->button());
+            }
+        } else if (!shiftOrControlPressed) {
+            m_selectionManager->clearSelection();
         }
-    } else if (!shiftOrControlPressed) {
-        m_selectionManager->clearSelection();
     }
 
+    m_dragging = false;
+    m_pressedMousePos = QPointF();
     m_pressedIndex = -1;
     return false;
 }
@@ -403,6 +424,8 @@ bool KItemListController::dropEvent(QGraphicsSceneDragDropEvent* event, const QT
 {
     Q_UNUSED(event);
     Q_UNUSED(transform);
+
+    m_dragging = false;
     return false;
 }
 
@@ -577,14 +600,13 @@ void KItemListController::slotRubberBandChanged()
         rubberBandRect.translate(-m_view->offset(), 0);
     }
 
-    QSet<int> previousSelectedItems;
-    if (m_selectionManager->hasSelection()) {
-        // Don't clear the current selection in case if the user pressed the
-        // Shift- or Control-key during the rubberband selection
+    if (!m_oldSelection.isEmpty()) {
+        // Clear the old selection that was available before the rubberband has
+        // been activated in case if no Shift- or Control-key are pressed
         const bool shiftOrControlPressed = QApplication::keyboardModifiers() & Qt::ShiftModifier ||
                                            QApplication::keyboardModifiers() & Qt::ControlModifier;
-        if (shiftOrControlPressed) {
-            previousSelectedItems = m_selectionManager->selectedItems();
+        if (!shiftOrControlPressed) {
+            m_oldSelection.clear();
         }
     }
 
@@ -631,7 +653,30 @@ void KItemListController::slotRubberBandChanged()
         }
     } while (!selectionFinished);
 
-    m_selectionManager->setSelectedItems(selectedItems + previousSelectedItems);
+    m_selectionManager->setSelectedItems(selectedItems + m_oldSelection);
+}
+
+void KItemListController::startDragging()
+{
+    if (!m_view || !m_model) {
+        return;
+    }
+
+    const QSet<int> selectedItems = m_selectionManager->selectedItems();
+    QMimeData* data = m_model->createMimeData(selectedItems);
+    if (!data) {
+        return;
+    }
+
+    // The created drag object will be owned and deleted
+    // by QApplication::activeWindow().
+    QDrag* drag = new QDrag(QApplication::activeWindow());
+    drag->setMimeData(data);
+
+    const QPixmap pixmap = m_view->createDragPixmap(selectedItems);
+    drag->setPixmap(pixmap);
+
+    drag->exec(Qt::MoveAction | Qt::CopyAction | Qt::LinkAction, Qt::IgnoreAction);
 }
 
 #include "kitemlistcontroller.moc"