Changeset 466

Timestamp:

Jan 22, 2010, 3:38:55 PM (15 years ago)

Author:

Dmitry A. Kuminov

Message:

gui: DnD: Fixed: Drag events over children that don't accept drops are now propagated to parents (similarly to other platforms).

File:

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

trunk/src/gui/kernel/qdnd_pm.cpp

@@ -511 +511 @@
             }
 
-            if (!dragOverWidget->acceptDrops()) {
-                // We don't reply with DOR_NEVERDROP here because in this
-                // case PM will stop sending DM_DRAGOVER to the given HWND but
-                // we may have another non-native child (that has the same HWND)
-                // at a different position that accepts drops
-                DrgFreeDraginfo(info);
-                return MRFROM2SHORT(DOR_NODROP, 0);
-            }
+            // Note: we don't check if dragOverWidget->acceptDrops() here since
+            // this will be checked in QApplication::notify() and the
+            // appropriate action will be taken (the message will be delivered
+            // to the parent)
 
             USHORT dropReply = dragData->lastDropReply;
@@ -688 +684 @@
             if (dragData->lastDragOverWidget != widget)
                 pnt = dragData->lastDragOverWidget->mapFrom(widget, pnt);
-
-            Q_ASSERT(dragData->lastDragOverWidget->acceptDrops());
-            if (!dragData->lastDragOverWidget->acceptDrops()) {
-                DrgDeleteDraginfoStrHandles(info);
-                DrgFreeDraginfo(info);
-                return 0;
-            }
 
             QMimeData *data = manager->source() ? manager->dragPrivate()->data : manager->dropData;