Changeset 463 for trunk/src/gui/kernel

Timestamp:

Jan 21, 2010, 9:52:06 PM (16 years ago)

Author:

Dmitry A. Kuminov

Message:

gui: DnD: Respect the change to the drop action applications may make in the QDropEvent handlers.

File:

• trunk/src/gui/kernel/qdnd_pm.cpp (modified) (1 diff)

trunk/src/gui/kernel/qdnd_pm.cpp

@@ -697 +697 @@
             QMimeData *data = manager->source() ? manager->dragPrivate()->data : manager->dropData;
 
-            QDropEvent de(pnt, dragData->lastAction, data, mouseButtons(),
-                          keyboardModifiers());
+            QDropEvent de(pnt, toQDragDropActions(dragData->supportedOps),
+                          data, mouseButtons(), keyboardModifiers());
             if (dragData->lastDropReply == DOR_DROP)
                 de.setDropAction(dragData->lastAction);
-
             sendDropEvent(dragData->lastDragOverWidget, &de);
 
             if (dragData->lastDropReply == DOR_DROP)
                 de.accept();
+
+            if (de.isAccepted()) {
+                // We must update usOperation so that if the application changes
+                // the drop action during processing of the QDropEvent this
+                // change will be visible at the DrgDrag() end. This is odd (since
+                // it may be easily made out of sync with the visual indication)
+                // but needed for compatibility with other platforms.
+                info->usOperation = toPmDragDropOp(de.dropAction());
+            }
 
             dragData->lastDragOverWidget = 0;