Changeset 464 for trunk/src/gui/kernel

Timestamp:

Jan 22, 2010, 12:20:06 PM (16 years ago)

Author:

Dmitry A. Kuminov

Message:

gui: DnD: Revalidate the default acceptance of the next drag move event after the operation is changed by a modifier key.

File:

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

trunk/src/gui/kernel/qdnd_pm.cpp

@@ -561 +561 @@
                         ((dragData->supportedOps & DO_LINKABLE) && realOp == DO_LINK);
                     dragData->lastDragOverOp = realOp;
+                    dropReply = dragData->sourceAllowsOp ? DOR_DROP : DOR_NODROP;
                 }
 
@@ -595 +596 @@
                                        toQDragDropActions(dragData->supportedOps),
                                        data, mouseButtons(), keyboardModifiers());
-                    // accept by default, since enter event was accepted.
                     dme.setDropAction(dragData->lastAction);
+                    // accept by default if the enter event was accepted
                     if (dropReply == DOR_DROP)
                         dme.accept();