Changeset 745 for trunk/src

Timestamp:

Jun 11, 2010, 4:45:27 PM (15 years ago)

Author:

Dmitry A. Kuminov

Message:

gui: OS/2: In Dive mode, the screen would get corrupted if the application created a child window with a real HWND (as e.g. smplayer does). Fixes #163.

Location:

trunk/src/gui/painting

Files:

• qwindowsurface_pm.cpp (modified) (3 diffs)
• qwindowsurface_raster.cpp (modified) (3 diffs)

trunk/src/gui/painting/qwindowsurface_pm.cpp

@@ -403 +403 @@
     QRect br = rgn.boundingRect();
 
-    QPoint wOffset = qt_qwidget_data(widget)->wrect.topLeft();
-    QRect wbr = br.translated(-wOffset);
     br.translate(offset);
 
@@ -432 +430 @@
         br = br.intersected(QRect(0, 0, d->image->width(), d->image->height()));
 
+        QPoint wOffset = qt_qwidget_data(widget)->wrect.topLeft();
+        // note that we remove offset from wbr because the widget's HPS has a proper
+        // origin already that includes this offset (which is in fact a position of
+        // the widget relative to its top-level parent)
+        QRect wbr = br.translated(-offset - wOffset);
+
         BITMAPINFOHEADER2 bmh;
         memset(&bmh, 0, sizeof(BITMAPINFOHEADER2));
@@ -452 +456 @@
         return;
     }
+
+    QPoint wOffset = qt_qwidget_data(widget)->wrect.topLeft();
+    // note that we leave offset in wbr since in DIVE mode the origin of the
+    // blit target is always the top level window so we need to properly offset
+    // the target position if we are flushing its child widget
+    QRect wbr = br.translated(-wOffset);
 
     if (d->vrnDisabled) {

trunk/src/gui/painting/qwindowsurface_raster.cpp

@@ -232 +232 @@
 
     QPoint wOffset = qt_qwidget_data(widget)->wrect.topLeft();
+    // note that we remove offset from wbr because the widget's HPS has a proper
+    // origin already that includes this offset (which is in fact a position of
+    // the widget relative to its top-level parent)
     QRect wbr = br.translated(-offset - wOffset);
 
@@ -272 +275 @@
 
     QPoint wOffset = qt_qwidget_data(widget)->wrect.topLeft();
+    // note that we remove offset from wbr because the widget's HPS has a proper
+    // origin already that includes this offset (which is in fact a position of
+    // the widget relative to its top-level parent)
     QRect wbr = br.translated(-offset - wOffset);
 
@@ -334 +340 @@
 
     QPoint wOffset = qt_qwidget_data(widget)->wrect.topLeft();
+    // note that we remove offset from wbr because the widget's HPS has a proper
+    // origin already that includes this offset (which is in fact a position of
+    // the widget relative to its top-level parent)
     QRect wbr = br.translated(-offset - wOffset);