Commit 3120ea30 authored by Laurent Montel's avatar Laurent Montel 😁
Browse files

Merge remote-tracking branch 'origin/release/20.12'

parents 1565bb57 6cfce924
Pipeline #48315 passed with stage
in 13 minutes and 3 seconds
......@@ -233,7 +233,7 @@ bool DragDropManager::processDropEvent(QDropEvent *event, bool &menuCanceled, bo
popup.addSeparator();
popup.addAction(QIcon::fromTheme(QStringLiteral("process-stop")), i18n("C&ancel") + QLatin1Char('\t') + QKeySequence(Qt::Key_Escape).toString());
QAction *activatedAction = popup.exec(QCursor::pos());
QAction *activatedAction = popup.exec(m_view->mapToGlobal(event->pos()));
if (activatedAction == moveDropAction) {
event->setDropAction(Qt::MoveAction);
} else if (activatedAction == copyDropAction) {
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment