Changeset 100

Timestamp:

Jul 23, 2006, 9:21:05 PM (19 years ago)

Author:

dmik

Message:

Widgets: Fixed:

• Siblings of top-level widgets were not clipped out when drawing in those widgets.
• Scrolling a widget partly placed outside screen bounds could produce garbage.
• Scrolling a widget placed under a top-level widget (tooltip, popup) could produce garbage.
• Widget's invalid region was not updated (shifted) when scrolling.

File:

• trunk/src/kernel/qwidget_pm.cpp (modified) (13 diffs)

trunk/src/kernel/qwidget_pm.cpp

@@ -112 +112 @@
 }
 
-/** \internal flags for qt_WinProcessWindowObstacles() */
-enum {
-    PWO_Children = 0x01,
-    PWO_Sibings = 0x02,
-    PWO_Ancestors = 0x04,
-    PWO_TopLevel = 0x80000000,
-    // PWO_Default is suitable in most cases (for simple paint operations)
-    PWO_Default = PWO_Children | PWO_Sibings | PWO_Ancestors, 
-};
-
 /**
  *  \internal
@@ -216 +206 @@
 }
 
+/** \internal flags for qt_WinProcessWindowObstacles() */
+enum {
+    PWO_Children = 0x01,
+    PWO_Sibings = 0x02,
+    PWO_Ancestors = 0x04,
+    PWO_Screen = 0x08,
+    PWO_TopLevel = 0x80000000,
+    // PWO_Default is suitable in most cases (for simple paint operations)
+    PWO_Default = PWO_Children | PWO_Sibings | PWO_Ancestors | PWO_Screen, 
+};
+
 /**
  *  \internal
@@ -257 +258 @@
     HWND relative;
     SWP swp;
-    
-    // first, go through all children (in z-order)
+
+    // first, process areas placed outside the screen bounds
+    if ( flags & PWO_Screen ) {
+        RECTL rclScr = { 0, 0, QApplication::desktop()->width(),
+                               QApplication::desktop()->height() };
+        WinMapWindowPoints( HWND_DESKTOP, hwnd, (PPOINTL) &rclScr, 2 );
+        // rough check of whether some window part is outside bounds
+        if ( rclSelf.xLeft < rclScr.xLeft ||
+             rclSelf.yBottom < rclScr.yBottom ||
+             rclSelf.xRight > rclScr.xRight ||
+             rclSelf.yTop > rclScr.yTop ) {
+            GpiSetRegion( displayPS, whrgn, 1, &rclSelf );
+            HRGN hrgnScr = GpiCreateRegion( displayPS, 1, &rclScr );
+            // substract the screen region from this window's region
+            // to get parts placed outside
+            GpiCombineRegion( displayPS, whrgn, whrgn, hrgnScr, CRGN_DIFF );
+            GpiDestroyRegion( displayPS, hrgnScr ); 
+            // process the region
+            if ( hrgn != NULLHANDLE ) {
+                cmplx = GpiCombineRegion( displayPS, hrgn, hrgn, whrgn, op );
+            } else {
+                WinValidateRegion( hwnd, whrgn, FALSE ); 
+            }
+#if defined (DEBUG_WIDGETMASK)
+            qDebug( " collected areas outside screen bounds" );
+#endif
+         }
+    }
+    
+    // next, go through all children (in z-order)
     if ( flags & PWO_Children ) {
         relative = WinQueryWindow( hwnd, QW_BOTTOM );
@@ -289 +318 @@
                 }
 #if defined (DEBUG_WIDGETMASK)
-                qDebug( "  extracted" );
+                qDebug( "  collected" );
 #endif
             }
@@ -331 +360 @@
             }
 #if defined (DEBUG_WIDGETMASK)
-            qDebug( "  extracted" );
+            qDebug( "  collected" );
 #endif
         }
@@ -392 +421 @@
                 }
 #if defined (DEBUG_WIDGETMASK)
-                qDebug( "  extracted" );
+                qDebug( "  collected" );
 #endif
             }
@@ -759 +788 @@
         // areas outside the clip region are left unpainted. Instead, we correct
         // the update region of the window ourselves, on every WM_PAINT event.
+        // Note: for top-level widgets, we specify WS_CLIPSIBLINGS anyway to let
+        // the system do correct clipping for us (qt_WinProcessWindowObstacles()
+        // relies on this). It's ok because top-level widgets cannot be non-
+        // rectangular and therefore don't require our magic clipping procedure. 
+        if ( topLevel /* && !testWFlags( WPaintUnclipped ) */ )
+            style |= WS_CLIPSIBLINGS;
 #else
         /// @todo (dmik)
@@ -765 +800 @@
         //  box and list view. This needs to be investigated. Qt/Win32 does also
         //  comment this out...
-        /* if ( !testWFlags( WPaintUnclipped ) ) */
-            style |= WS_CLIPSIBLINGS | WS_CLIPCHILDREN;
+        /* if ( !testWFlags( WPaintUnclipped ) ) */
+                style |= WS_CLIPSIBLINGS | WS_CLIPCHILDREN;
 #endif            
         // for all top-level windows except popups we create a WC_FRAME
@@ -2150 +2185 @@
         HWND i = id;
         while( (i = WinQueryWindow( i, QW_PREV )) ) {
-            if ( WinIsWindowShowing( i ) ) {
+            if ( WinIsWindowVisible( i ) ) {
                 WinQueryWindowRect( i, &r );
                 WinMapWindowPoints( i, hwnd, (PPOINTL) &r, 2 );
@@ -2306 +2341 @@
     HPS hps = WinGetPS( hwnd );
 
+    // get the current update (invalid) region
+    HRGN hrgnInv = GpiCreateRegion( hps, 0, NULL );
+    if ( WinQueryUpdateRegion( hwnd, hrgnInv ) != RGN_NULL ) {
+        // validate it (since it's no more up-to-date after scrolling)
+        WinValidateRegion( hwnd, hrgnInv, clip == NULL ); 
+        // scroll it to get the new invalid region
+        GpiOffsetRegion( hps, hrgnInv, &ptlDelta );
+    }
+    
     // get widget bounds (clip region or rect)
     HRGN hrgnClip = GpiCreateRegion( hps, 0, NULL );
     qt_WinQueryClipRegionOrRect( hwnd, hrgnClip );
+
+    if ( clip ) {
+        // intersect it with the given clip rect
+        HRGN hrgn = GpiCreateRegion( hps, 1, clip );
+        GpiCombineRegion( hps, hrgnClip, hrgn, hrgnClip, CRGN_AND );
+        GpiDestroyRegion( hps, hrgn );
+    }
+
     // compose a region uncovered after scrolling
     HRGN hrgnUpd = GpiCreateRegion( hps, 0, NULL );
@@ -2314 +2366 @@
     GpiOffsetRegion( hps, hrgnUpd, &ptlDelta );
     GpiCombineRegion( hps, hrgnUpd, hrgnClip, hrgnUpd, CRGN_DIFF );
-    
-    if ( clip ) {
-        // intersect it with the given clip rect
-        HRGN hrgn = GpiCreateRegion( hps, 1, clip );
-        GpiCombineRegion( hps, hrgnUpd, hrgnClip, hrgnUpd, CRGN_AND );
-        GpiDestroyRegion( hps, hrgn );
-    }
-    
-    int pwoFlags = PWO_Ancestors | PWO_Sibings | PWO_TopLevel;
+
+    int pwoFlags = PWO_Ancestors | PWO_Sibings | PWO_TopLevel | PWO_Screen;
     if ( clip )
         pwoFlags |= PWO_Children;
@@ -2333 +2378 @@
     GpiCombineRegion( hps, hrgnDelta, hrgnObst, 0, CRGN_COPY );
     GpiOffsetRegion( hps, hrgnDelta, &ptlDelta );
-    // substract the region of obstaces fro the delta region to get pure delta
+    // substract the region of obstaces from the delta region to get pure delta
     GpiCombineRegion( hps, hrgnDelta, hrgnDelta, hrgnObst, CRGN_DIFF );
-    // substract obstacles the clip region 
+    // substract obstacles from the clip region 
     GpiCombineRegion( hps, hrgnClip, hrgnClip, hrgnObst, CRGN_DIFF );
     // substract pure delta from the clip region (to reduce flicker) 
     GpiCombineRegion( hps, hrgnClip, hrgnClip, hrgnDelta, CRGN_DIFF );
+    // substract the new invalid region from the clip region (to reduce flicker) 
+    GpiCombineRegion( hps, hrgnClip, hrgnClip, hrgnInv, CRGN_DIFF );
     
     // scroll the area
@@ -2350 +2397 @@
     // invalidate the region uncovered after scrolling
     WinInvalidateRegion( hwnd, hrgnUpd, clip == NULL );
-    
+
+    // put the new invalid region back 
+    WinInvalidateRegion( hwnd, hrgnInv, clip == NULL );
+    
+    GpiDestroyRegion( hps, hrgnInv );
     GpiDestroyRegion( hps, hrgnDelta );
     GpiDestroyRegion( hps, hrgnObst );