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

QAbstractItemView: Don't allow CopyAction for InternalMove views

Browse Source 
Otherwise the default action will be Copy, and the (+) cursor will show when
moving items in e.g a QListView/Widget, even though the item will actually
be moved.

The documentation of InternalMove states clearly that "The view accepts
move (not copy) operations only from itself.".

Task-number: QTBUG-87057
Pick-to: 5.15
Change-Id: Idaa9e8f84623ced51b1c51a3730466dc0678d6b3
Reviewed-by: David Faure <david.faure@kdab.com>
Reviewed-by: Morten Johan Sørvig <morten.sorvig@qt.io>
This commit is contained in:
Volker Hilsheimer 2020-09-29 23:27:24 +02:00
parent ecfda98d1f
commit 60eb306efe
1 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -3693,6 +3693,8 @@ void QAbstractItemView::startDrag(Qt::DropActions supportedActions)
drag->setMimeData(data); drag->setMimeData(data);
drag->setHotSpot(d->pressedPosition - rect.topLeft()); drag->setHotSpot(d->pressedPosition - rect.topLeft());
Qt::DropAction defaultDropAction = Qt::IgnoreAction; Qt::DropAction defaultDropAction = Qt::IgnoreAction;
if (dragDropMode() == InternalMove)
supportedActions &= ~Qt::CopyAction;
if (d->defaultDropAction != Qt::IgnoreAction && (supportedActions & d->defaultDropAction)) if (d->defaultDropAction != Qt::IgnoreAction && (supportedActions & d->defaultDropAction))
defaultDropAction = d->defaultDropAction; defaultDropAction = d->defaultDropAction;
else if (supportedActions & Qt::CopyAction && dragDropMode() != QAbstractItemView::InternalMove) else if (supportedActions & Qt::CopyAction && dragDropMode() != QAbstractItemView::InternalMove)