Changeset 472

Timestamp:

Jan 25, 2010, 5:56:00 PM (15 years ago)

Author:

Dmitry A. Kuminov

Message:

gui: DnD: Fixed: Don't accept QDragMoveEvent by default if the previous QDragEnterEvent/QDragMoveEvent was rejected.

File:

• trunk/src/gui/kernel/qdnd_pm.cpp (modified) (4 diffs)

trunk/src/gui/kernel/qdnd_pm.cpp ¶

@@ -557 +557 @@
                         ((dragData->supportedOps & DO_LINKABLE) && realOp == DO_LINK);
                     dragData->lastDragOverOp = realOp;
-                    dropReply = dragData->sourceAllowsOp ? DOR_DROP : DOR_NODROP;
+                    // make sure the default accepted state for the next event
+                    // correlates with the set of supported operations
+                    if (dropReply == DOR_DROP)
+                        dropReply = dragData->sourceAllowsOp ? DOR_DROP : DOR_NODROP;
                 }
 
@@ -583 +586 @@
                         dropReply = DOR_NODROP;
                     }
+                    DEBUG(() << "DM_DRAGOVER: QDragEnterEvent: accepted" << dee.isAccepted());
                 }
 
@@ -604 +608 @@
                         dropReply = DOR_NODROP;
                     }
+                    DEBUG(() << "DM_DRAGOVER: QDragMoveEvent: accepted" << dme.isAccepted());
                 }
 
@@ -611 +616 @@
             DrgFreeDraginfo(info);
 
-            DEBUG(("DM_DRAGOVER: return %08lx default %08lx",
+            DEBUG(("DM_DRAGOVER: return %08x default %08x",
                    dropReply, toPmDragDropOp(dragData->lastAction)));
             return MRFROM2SHORT(dropReply, toPmDragDropOp(dragData->lastAction));