Changeset 758 for trunk/src/gui/painting/qwindowsurface_pm.cpp

Timestamp:

Jun 22, 2010, 9:20:42 PM (15 years ago)

Author:

Dmitry A. Kuminov

Message:

gui: OS/2: Applied the solution from r751 to the non-DIVE code path (closes #161).

File:

• trunk/src/gui/painting/qwindowsurface_pm.cpp (modified) (1 diff)

trunk/src/gui/painting/qwindowsurface_pm.cpp

@@ -607 +607 @@
         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);
+        int wh = widget->height();
+
+        // produce a clip region that excludes all descending obstacles
+        // (like child widgets with real HWNDs which are not excluded by Qt)
+        HWND wwnd = widget->winId();
+        RECTL wrcl = { wbr.left(), wh - wbr.bottom() - 1,
+                       wbr.right() + 1, wh - wbr.top() };
+        HRGN wrgn = GpiCreateRegion(wps, 1L, &wrcl);
+        ULONG rc = qt_WinProcessWindowObstacles(wwnd, NULL, wrgn, CRGN_DIFF,
+                                                PWO_Children);
+        if (rc == RGN_RECT || rc == RGN_COMPLEX) {
+            // set the clip region
+            HRGN oldRgn;
+            GpiSetClipRegion(wps, wrgn, &oldRgn);
+            wrgn = oldRgn;
+
+            // 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);
+        }
+
+        if (wrgn != NULLHANDLE)
+            GpiDestroyRegion(wps, wrgn);
 
         widget->releasePS(wps);