Changeset 453 for trunk/src

Timestamp:

Jan 20, 2010, 3:33:10 PM (16 years ago)

Author:

Dmitry A. Kuminov

Message:

gui: DnD: Fixed: Coordinates of the DnD events were vertically shifted.

File:

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

trunk/src/gui/kernel/qdnd_pm.cpp

@@ -406 +406 @@
             if (!dragOverWidget)
                 dragOverWidget = widget;
+            else
+                pnt = dragOverWidget->mapFrom(widget, pnt);
 
             bool first = dragData->lastDragOverWidget != dragOverWidget;
@@ -420 +422 @@
                         if (!dragOverWidget)
                             dragOverWidget = widget;
+                        else
+                            pnt = dragOverWidget->mapFrom(widget, pnt);
                     }
                 }
@@ -582 +586 @@
             pnt.setY(QApplication::desktop()->height() - (pnt.y() + 1));
             pnt = widget->mapFromGlobal(pnt);
-
-            Q_ASSERT(dragData->lastDragOverOp == info->usOperation);
+            if (dragData->lastDragOverWidget != widget)
+                pnt = dragData->lastDragOverWidget->mapFrom(widget, pnt);
 
             Q_ASSERT(dragData->lastDragOverWidget->acceptDrops());