Changeset 786

Timestamp:

Oct 7, 2010, 3:04:40 PM (15 years ago)

Author:

Dmitry A. Kuminov

Message:

gui: DnD: Fixed: Repainting the widget during DnD outside the drag*Event() callbacks would cause distortion under the mouse pointer in DIVE mode.

Location:

trunk/src/gui

Files:

• kernel/qapplication_pm.cpp (modified) (1 diff)
• kernel/qdnd_p.h (modified) (2 diffs)
• kernel/qwidget.cpp (modified) (2 diffs)
• painting/qwindowsurface_pm.cpp (modified) (2 diffs)

trunk/src/gui/kernel/qapplication_pm.cpp

@@ -1084 +1084 @@
                 bool focus = SHORT1FROMMP(mp2);
                 if (!focus) {
-                    if (!QWidget::find(hwnd) && !QDragManager::self()->object) {
+                    if (!QWidget::find(hwnd) && !QDragManager::self()->isInOwnDrag()) {
                         // we gave up focus to another application, unset Qt
-                        // focus (exclude the situation when we start drag in
-                        // which case the PM focus goes to the drag bitmap while
-                        // the Qt focus should stay with our application)
+                        // focus (exclude the situation when we've started the
+                        // drag in which case the PM focus goes to the drag
+                        // bitmap but the Qt focus should stay with us)
                         if (QApplication::activePopupWidget()) {
                             foreignFocusWnd = hwnd;

trunk/src/gui/kernel/qdnd_p.h

@@ -267 +267 @@
     QWidget *currentTarget();
 
+    bool isInOwnDrag() const { return object != 0; }
+
 #ifdef Q_WS_X11
     QPixmap xdndMimeTransferedPixmap[2];
@@ -287 +289 @@
 #endif
 #ifdef Q_OS_SYMBIAN
-#ifndef QT_NO_CURSOR 
+#ifndef QT_NO_CURSOR
     QCursor overrideCursor;
 #endif

trunk/src/gui/kernel/qwidget.cpp

@@ -11057 +11057 @@
         return (HPS) d->hd;
 #ifndef QT_NO_DRAGANDDROP
-    if (QDragManager::self()->isInDrag())
+    if (QDragManager::self()->isInDrag() ||
+        QDragManager::self()->isInOwnDrag())
         return DrgGetPS(winId());
 #endif
@@ -11076 +11077 @@
     if (d->hd == NULLHANDLE) {
 #ifndef QT_NO_DRAGANDDROP
-        if (QDragManager::self()->isInDrag())
+        if (QDragManager::self()->isInDrag() ||
+            QDragManager::self()->isInOwnDrag())
             DrgReleasePS(hps);
         else

trunk/src/gui/painting/qwindowsurface_pm.cpp

@@ -63 +63 @@
 #include "qwindowsurface_pm_p.h"
 #include "private/qnativeimage_p.h"
+#include "private/qdnd_p.h"
 
 ////////////////////////////////////////////////////////////////////////////////
@@ -566 +567 @@
     br.translate(offset);
 
-    if (d->inDrag) {
+    if (d->inDrag || QDragManager::self()->isInOwnDrag()) {
         // In drag, DIVE seems to not synchronize well with the mouse buffer
         // that preserves the contents under the mouse pointer and the drag