Ticket #292: dnd_ignoreaction.diff

src/gui/kernel/qdnd_pm.cpp

@@ -110 +110 @@
     friend class QDragManager;
 
     void initWorkers();
+    bool allowedOp(USHORT realOp);
 
     bool initialized : 1;
     bool fakeDrop : 1;
@@ -123 +124 @@
     USHORT lastDragOverOp; // last DM_DRAGOVER operation
 
     USHORT supportedOps; // operations supported by all items
-    bool sourceAllowsOp : 1; // does source allow requested operation
 
     USHORT lastDropReply; // last reply to DM_DRAGOVER
 
@@ -135 +135 @@
     : initialized(false), fakeDrop(false)
     , gotWorkers(false), canSyncRndr(false), di(NULL)
     , lastDragOverWidget(0), lastDragOverOp(0)
-    , supportedOps(0), sourceAllowsOp(false)
+    , supportedOps(0) 
     , lastDropReply(DOR_NEVERDROP)
     , lastAction(Qt::CopyAction)
 {
@@ -246 +246 @@
     }
 }
 
+// does source allow requested operation
+bool QPMDragData::allowedOp(USHORT realOp)
+{
+    return ((supportedOps & DO_MOVEABLE) && realOp == DO_MOVE) ||
+           ((supportedOps & DO_COPYABLE) && realOp == DO_COPY) ||
+           ((supportedOps & DO_LINKABLE) && realOp == DO_LINK);
+}
+
 void QPMDragData::reset(bool isAccepted)
 {
     if (!initialized)
@@ -505 +513 @@
                 dragData->lastDragOverWidget = dragOverWidget;
                 dragData->lastDragOverOp = 0;
                 dragData->supportedOps = DO_COPYABLE | DO_MOVEABLE | DO_LINKABLE;
-                dragData->sourceAllowsOp = false;
                 dragData->lastDropReply = DOR_NEVERDROP;
                 dragData->lastAction =
                     manager->defaultAction(toQDragDropActions(dragData->supportedOps),
@@ -547 +554 @@
 
             if (dropReply != DOR_NEVERDROP) {
 
+#if 0
                 if (first || dragData->lastDragOverOp != info->usOperation) {
                     // the current drop operation was changed by a modifier key
                     USHORT realOp = info->usOperation;
@@ -571 +579 @@
                 // events anyway (stealing them from Qt would be confusing), but
                 // we will silently ignore any accept commands and always reject
                 // the drop. Other platforms seem to do the same.
-
+#endif
                 QMimeData *data = manager->source() ? manager->dragPrivate()->data : manager->dropData;
 
                 if (first) {
@@ -583 +591 @@
                     sendDropEvent(dragOverWidget, &dee);
                     // if not allowed or not accepted, always reply DOR_NODROP
                     // to have DM_DRAGOVER delivered to us again for a new test
-                    if (dragData->sourceAllowsOp && dee.isAccepted()) {
+                    if (dragData->allowedOp(toPmDragDropOp(dee.dropAction())) && dee.isAccepted()) {
                         dropReply = DOR_DROP;
                         dragData->lastAction = dee.dropAction();
                         dragData->lastAnswerRect = dee.answerRect();
@@ -605 +613 @@
                     if (dropReply == DOR_DROP)
                         dme.accept();
                     sendDropEvent(dragOverWidget, &dme);
-                    if (dragData->sourceAllowsOp && dme.isAccepted()) {
+                    if (dragData->allowedOp(toPmDragDropOp(dme.dropAction())) && dme.isAccepted()) {
                         dropReply = DOR_DROP;
                         dragData->lastAction = dme.dropAction();
                         dragData->lastAnswerRect = dme.answerRect();