Changeset 462 for trunk/src/gui/kernel

Timestamp:

Jan 21, 2010, 7:45:57 PM (15 years ago)

Author:

Dmitry A. Kuminov

Message:

gui: DnD: Fixed: Don't accept drag objects that were rejected by QDragEnter/QDragMove event handlers.

File:

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

trunk/src/gui/kernel/qdnd_pm.cpp

@@ -520 +520 @@
             }
 
-            USHORT dropReply = DOR_DROP;
+            USHORT dropReply = ;
 
             if (first) {
                 // determine the set of operations supported by *all* items
                 // (this implies that DRAGITEM::fsSupportedOps is a bit field)
+
                 ULONG itemCount = DrgQueryDragitemCount(info);
                 for (ULONG i = 0; i < itemCount; ++ i) {
@@ -596 +597 @@
                     // accept by default, since enter event was accepted.
                     dme.setDropAction(dragData->lastAction);
-                    dme.accept();
+                    if (dropReply == DOR_DROP)
+                        dme.accept();
                     sendDropEvent(dragOverWidget, &dme);
                     if (dragData->sourceAllowsOp && dme.isAccepted()) {