1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ItemViews: Don't remove items on internal move

Browse Source 
When an itemview only allows internal moving of items it can happen that
the target accepts the drag'n'drop operation since it's out of the
control of Qt (e.g. Recycle Bin or an other application). Due to the
nature of a move, the original item is deleted. Therefore check if the
internal move target is the same as the source and don't delete it
otherwse.

Fixes: QTBUG-86020
Change-Id: I69de4b8d76d1b0f57338b402aee87580226cd6cb
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
(cherry picked from commit 12d8bb0709bf7982061cb0c3e608e4a581892e35)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
This commit is contained in:
Christian Ehrlicher 2020-12-08 21:27:40 +01:00 committed by Qt Cherry-pick Bot
parent c855608119
commit 93e4f88204
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/widgets/itemviews/qabstractitemview.cpp
View File

@ -3702,8 +3702,10 @@ void QAbstractItemView::startDrag(Qt::DropActions supportedActions)
else if (supportedActions & Qt::CopyAction && dragDropMode() != QAbstractItemView::InternalMove)
defaultDropAction = Qt::CopyAction;
d->dropEventMoved = false;
if (drag->exec(supportedActions, defaultDropAction) == Qt::MoveAction && !d->dropEventMoved)
d->clearOrRemove();
if (drag->exec(supportedActions, defaultDropAction) == Qt::MoveAction && !d->dropEventMoved) {
if (dragDropMode() != InternalMove || drag->target() == viewport())
d->clearOrRemove();
}
d->dropEventMoved = false;
// Reset the drop indicator
d->dropIndicatorRect = QRect();

6
src/widgets/itemviews/qlistview.cpp
View File

@ -2901,8 +2901,10 @@ bool QIconModeViewBase::filterStartDrag(Qt::DropActions supportedActions)
Qt::DropAction action = drag->exec(supportedActions, dd->defaultDropAction);
draggedItems.clear();
// delete item, unless it has already been moved internally (see filterDropEvent)
if (action == Qt::MoveAction && !dd->dropEventMoved)
dd->clearOrRemove();
if (action == Qt::MoveAction && !dd->dropEventMoved) {
if (dd->dragDropMode != QAbstractItemView::InternalMove || drag->target() == qq->viewport())
dd->clearOrRemove();
}
dd->dropEventMoved = false;
}
return true;