whytofly
/
qt6-bb10
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

macOS: Don't override action set during drop handling 

When the drop has been handled, the target might have accepted a specific
action by calling QDropEvent::setDropAction. Don't override that with
the operation received by the OS if the drag'n'drop operation takes place
within the same application. If the operation comes from outside, we have
no choice but to trust the OS.

This way the drag-site will get the action accepted by the drop-site when
QDrag::drag returns.

Fixes: QTBUG-77427
Pick-to: 6.1 6.0 5.15
Change-Id: I0e4c86adeeea66b345966a03a3251fa62263b3e8
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
bb10
Andy Shaw 2021-01-13 17:40:18 +01:00 committed by Volker Hilsheimer
parent 0e4cc15da3
commit a014300898
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/plugins/platforms/cocoa/qnsview_dragging.mm
View File

@ -296,7 +296,9 @@ static QPoint mapWindowCoordinates(QWindow *source, QWindow *target, QPoint poin
QCocoaDrag* nativeDrag = QCocoaIntegration::instance()->drag();
Q_ASSERT(nativeDrag);
nativeDrag->exitDragLoop();
nativeDrag->setAcceptedAction(qt_mac_mapNSDragOperation(operation));
// for internal drag'n'drop, don't override the action the drop event accepted
if (!nativeDrag->currentDrag())
nativeDrag->setAcceptedAction(qt_mac_mapNSDragOperation(operation));
// Qt starts drag-and-drop on a mouse button press event. Cococa in
// this case won't send the matching release event, so we have to