Changeset 743 for trunk/src

Timestamp:

May 31, 2010, 4:52:33 PM (15 years ago)

Author:

Dmitry A. Kuminov

Message:

gui: Fixed: Qt Assistant would corrupt screen at startup in DIVE FB mode (fixes ticket:160) [based on patch by rudi].

File:

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

trunk/src/gui/painting/qwindowsurface_pm.cpp

@@ -336 +336 @@
     bool vrnDisabled;
     bool inDrag;
+    int windowHeight;
     SETUP_BLITTER setup;
     QVector<RECTL> rcls;
@@ -358 +359 @@
     d->vrnDisabled = false;
     d->inDrag = false;
+    d->windowHeight = 0;
 
     memset(&d->setup, 0, sizeof(SETUP_BLITTER));
@@ -513 +515 @@
         GpiDestroyRegion(hps, hrgn);
         window()->releasePS(hps);
+
+        // memorize the window height used for the additional visible region
+        // validation in doFlush()
+        d->windowHeight = window()->height();
 
 #if defined(QDIVE_DEBUG)
@@ -639 +645 @@
         if (!d->useFB) {
             // associate the image data pointer with the buffer number
-            DiveFreeImageBuffer(d->hDive, d->bufNum);
+            if (d->bufNum)
+                DiveFreeImageBuffer(d->hDive, d->bufNum);
             d->bufNum = 0;
             ULONG rc = DiveAllocImageBuffer(d->hDive, &d->bufNum,
@@ -928 +935 @@
     QPoint dstDelta = from.topLeft() - to;
 
+    const int windowHeight = window()->height();
+
+    // sometimes PM does not send WM_VRNENABLED although the window size has
+    // been changed (this is known to happen in FB mode with the Qt Assistant
+    // application) which leads to screen corruption due to outdated visible
+    // regions. A fix is to memorize the window height and check it here
+    if (windowHeight != d->windowHeight)
+        d->vrnDirty = true;
+
     bool wasPosDirty = d->posDirty;
     bool wasVrnDirty = d->vrnDirty;
 
     adjustSetup();
-
-    const int windowHeight = window()->height();
 
     if (wasVrnDirty) {