[Places Panel] Stop drag activation timer when dropping

Avoids switching folders after a drop while interacting with
the Copy/Move/Link menu.

diff --git a/src/panels/places/placespanel.cpp b/src/panels/places/placespanel.cpp
index 8fc81bb326a0bd49298384c41fa87644e2a0412a..5b2f040d1896acb15e9526a05563d3a1fe1259a4 100644 (file)
--- a/src/panels/places/placespanel.cpp
+++ b/src/panels/places/placespanel.cpp
@@ -165,6 +165,16 @@ void PlacesPanel::dragLeaveEvent(QDragLeaveEvent *event)
     }
 }
 
+void PlacesPanel::dropEvent(QDropEvent *event)
+{
+    KFilePlacesView::dropEvent(event);
+
+    if (m_dragActivationTimer) {
+        m_dragActivationTimer->stop();
+        m_pendingDragActivation = QPersistentModelIndex();
+    }
+}
+
 void PlacesPanel::slotConfigureTrash()
 {
     const QUrl url = currentIndex().data(KFilePlacesModel::UrlRole).toUrl();

diff --git a/src/panels/places/placespanel.h b/src/panels/places/placespanel.h
index fd6661c76fececbf67655000e3649aef9dd93042..570fc43be110bc265d9d775780d1eae71ca34a9b 100644 (file)
--- a/src/panels/places/placespanel.h
+++ b/src/panels/places/placespanel.h
@@ -56,6 +56,7 @@ protected:
     void showEvent(QShowEvent* event) override;
     void dragMoveEvent(QDragMoveEvent *event) override;
     void dragLeaveEvent(QDragLeaveEvent *event) override;
+    void dropEvent(QDropEvent *event) override;
 
 private Q_SLOTS:
     void slotConfigureTrash();