Changeset 786 for trunk/src/gui/kernel

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/kernel

Files:

• qapplication_pm.cpp (modified) (1 diff)
• qdnd_p.h (modified) (2 diffs)
• qwidget.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()->) {
                         // 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
+                        // 
+                        // )
                         if (QApplication::activePopupWidget()) {
                             foreignFocusWnd = hwnd;

trunk/src/gui/kernel/qdnd_p.h

@@ -267 +267 @@
     QWidget *currentTarget();
 
+
+
 #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