Changeset 1033

Timestamp:

Aug 28, 2011, 2:00:00 AM (14 years ago)

Author:

Dmitry A. Kuminov

Message:

OS/2: Fix native child widget painting in DIVE mode.

The dirty regions of nested child widgets were calculated incorrectly since the
HWND of the top-level window was used instead of the child HWND.

Note that this didn't show problems in Qt 4.6.3 since requesting a native HWND
for a child (which is used by video players to embed video to the Qt
application) didn't cause its siblings and sibligs of its parents to get native
HWNDs and therefore they didn't use the code that contained this bug. But in
r1012 this incorrect behavior was fixed and the problem immediately popped up.

File:

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

trunk/src/gui/painting/qwindowsurface_pm.cpp

@@ -524 +524 @@
 
     setStaticContentsSupport(true);
+
+    DEBUG(() << "QPMDiveWindowSurface:" << widget);
 }
 
@@ -658 +660 @@
 bool QPMDiveWindowSurface::adjustSetup(QWidget *widget)
 {
+    DEBUG(() << "QPMDiveWindowSurface::adjustSetup:" << window() << widget);
+
     HWND hwnd = window()->internalWinId();
 
@@ -687 +691 @@
         wd->vrnDirty = false;
 
-        HPS hps = window()->getPS();
+        HPS hps = widget->getPS();
         HRGN hrgn = GpiCreateRegion(hps, 0L, NULL);
 
-        ULONG rc = WinQueryVisibleRegion(hwnd, hrgn);
+        HWND hwndWidget = widget->internalWinId();
+        ULONG rc = WinQueryVisibleRegion(hwndWidget, hrgn);
         if (rc != RGN_ERROR) {
-            HWND hwndWidget = widget->internalWinId();
-            POINTL ptlOffset = { 0, 0 };
-            if (hwnd != hwndWidget) {
-                // translate the main widget's visible region to this widget's
-                // coordinate space
-                WinMapWindowPoints(hwnd, hwndWidget, &ptlOffset, 1);
-                GpiOffsetRegion(hps, hrgn, &ptlOffset);
-            }
             // substract children from the visible region, if any
             rc = qt_WinProcessWindowObstacles(hwndWidget, NULL, hrgn,
                                               CRGN_DIFF, PWO_Children);
             if (rc != RGN_ERROR && hwnd != hwndWidget) {
-                // translate back to the main widget's coordinate space
+                // translate coords to the main widget's coordinate space
+                POINTL ptlOffset = { 0, 0 };
+                WinMapWindowPoints(hwnd, hwndWidget, &ptlOffset, 1);
                 ptlOffset.x = -ptlOffset.x;
                 ptlOffset.y = -ptlOffset.y;
@@ -731 +730 @@
 
         GpiDestroyRegion(hps, hrgn);
-        window()->releasePS(hps);
+        widget->releasePS(hps);
 
         // memorize the window height used for the additional visible region