Changeset 718

Timestamp:

Apr 30, 2010, 5:45:52 PM (15 years ago)

Author:

Dmitry A. Kuminov

Message:

gui: Fixed painting under the mouse pointer in Dive mode while performing a drag-n-drop operation.

File:

• trunk/src/gui/painting/qwindowsurface_pm.cpp (modified) (5 diffs)

trunk/src/gui/painting/qwindowsurface_pm.cpp

@@ -333 +333 @@
     bool vrnDirty;
     bool vrnDisabled;
+    bool inDrag;
     SETUP_BLITTER setup;
     QVector<RECTL> rcls;
@@ -354 +355 @@
     d->vrnDirty = true;
     d->vrnDisabled = false;
+    d->inDrag = false;
 
     memset(&d->setup, 0, sizeof(SETUP_BLITTER));
@@ -399 +401 @@
     QRect wbr = br.translated(-wOffset);
     br.translate(offset);
+
+    if (d->inDrag) {
+        // In drag, DIVE seems to not synchronize well with the mouse buffer
+        // that preserves the contents under the mouse pointer and the drag
+        // image while dragging (even when we use DiveBlitImage()). As a result,
+        // we will get some areas unpainted under if painting is done during
+        // drag. Use the WinGetPS()/GpiDrawBits() way to fix it. The below code
+        // is merely a copy of QT_BITMAP_MIRROR == 3 from qwindowsurface_raster.cpp
+
+        HPS wps = window()->getPS();
+
+        MATRIXLF m;
+        m.fxM11 = MAKEFIXED(1, 0);
+        m.fxM12 = 0;
+        m.lM13 = 0;
+        m.fxM21 = 0;
+        m.fxM22 = MAKEFIXED(-1, 0);
+        m.lM23 = 0;
+        m.lM31 = 0;
+        m.lM32 = window()->height() - 1;
+        GpiSetDefaultViewMatrix(wps, 8, &m, TRANSFORM_REPLACE);
+
+        // make sure br doesn't exceed the backing storage size (it may happen
+        // during resize & move due to the different event order)
+        br = br.intersected(QRect(0, 0, d->image->width(), d->image->height()));
+
+        BITMAPINFOHEADER2 bmh;
+        memset(&bmh, 0, sizeof(BITMAPINFOHEADER2));
+        bmh.cbFix = sizeof(BITMAPINFOHEADER2);
+        bmh.cPlanes = 1;
+        bmh.cBitCount = d->image->depth();
+        bmh.cx = d->image->width();
+        bmh.cy = d->image->height();
+
+        // Note: target is inclusive-inclusive, source is inclusive-exclusive
+        POINTL ptls[] = { { wbr.left(), wbr.top() },
+                          { wbr.right(), wbr.bottom() },
+                          { br.left(), br.top() },
+                          { br.right() + 1, br.bottom() + 1 } };
+        GpiDrawBits(wps, (PVOID) const_cast<const QImage *>(d->image)->bits(),
+                    (PBITMAPINFO2) &bmh, 4, ptls, ROP_SRCCOPY, BBO_IGNORE);
+
+        window()->releasePS(wps);
+
+        return;
+    }
 
     if (d->vrnDisabled) {
@@ -521 +569 @@
             *result = 0;
             return true;
+        }
+        case DM_DRAGOVER: {
+            d->inDrag = true;
+            break;
+        }
+        case DM_DRAGLEAVE:
+        case DM_DROP: {
+            d->inDrag = false;
+            break;
         }
         case WM_VRNENABLED: {
@@ -537 +594 @@
 
             // process pending flush events
-            foreach(QPMDiveWindowSurfacePrivate::FlushArgs args, d->pending) {
+            foreach(QPMDiveWindowSurfacePrivate::FlushArgs args, d->pending)
                 doFlush(args.from, args.to);
-            }
             d->pending.clear();