]> cloud.milkyroute.net Git - dolphin.git/commitdiff
Update dragCursor while dragging
authorTranter Madi <trmdi@yandex.com>
Wed, 25 Mar 2020 15:23:30 +0000 (09:23 -0600)
committerNate Graham <nate@kde.org>
Wed, 25 Mar 2020 15:23:50 +0000 (09:23 -0600)
Summary:
While dragging, the user could want to change the modifier, so we should call event->acceptProposedAction() to do update the dragCursor.

FIXED-IN: 20.04.0

Test Plan: While dragging files, change modifiers between Ctrl/Shift/Alt... and move the mouse at least 1px to see the cursor changes.

Reviewers: #dolphin, meven, ngraham, davidedmundson, elvisangelaccio

Reviewed By: #dolphin, elvisangelaccio

Subscribers: elvisangelaccio, kfm-devel

Tags: #dolphin

Differential Revision: https://phabricator.kde.org/D28017

src/kitemviews/kitemlistcontroller.cpp

index 65c42b547d090d65be3fdb26d2289914aa3483ed..5ddf52e5f193dc84671c3248696d74f2bbeb8bf3 100644 (file)
@@ -929,8 +929,13 @@ bool KItemListController::dragMoveEvent(QGraphicsSceneDragDropEvent* event, cons
         m_view->hideDropIndicator();
     }
 
-    event->setAccepted(!DragAndDropHelper::urlListMatchesUrl(event->mimeData()->urls(), hoveredDir));
-
+    if (DragAndDropHelper::urlListMatchesUrl(event->mimeData()->urls(), hoveredDir)) {
+        event->setDropAction(Qt::IgnoreAction);
+        event->ignore();
+    } else {
+        event->setDropAction(event->proposedAction());
+        event->accept();
+    }
     return false;
 }