Changeset 8 for trunk/src/widgets/qsplitter.cpp

Timestamp:

Nov 16, 2005, 8:36:46 PM (20 years ago)

Author:

dmik

Message:

Transferred Qt for OS/2 version 3.3.1-rc5 sources from the CVS

File:

• trunk/src/widgets/qsplitter.cpp (modified) (2 diffs)

trunk/src/widgets/qsplitter.cpp

@@ -507 +507 @@
 {
     QPainter paint( this );
-    paint.setPen( gray );
+    paint.setPen( NoPen );
     paint.setBrush( gray );
     paint.setRasterOp( XorROP );
@@ -513 +513 @@
     const int rBord = 3; // customizable?
     int hw = handleWidth();
+
+    int p1, p2, op1, op2, tmp;
+    if ( p >= 0 ) {
+        p1 = p + hw / 2 - rBord;
+        p2 = p1 + 2 * rBord - 1;
+    }
+    if ( opaqueOldPos >= 0 ) {
+        op1 = opaqueOldPos + hw / 2 - rBord;
+        op2 = op1 + 2 * rBord - 1;
+        // exclude overlapping area to avoid flicker
+        if ( p >= 0 ) {
+            if ( p2 >= op1 && p2 <= op2 ) {
+                tmp = op1;
+                op1 = p2 + 1;
+                p2 = tmp - 1;
+            } else if ( p1 >= op1 && p1 <= op2 ) {
+                tmp = op2;
+                op2 = p1 - 1;
+                p1 = tmp + 1;
+            }
+        }
+    }
     if ( orient == Horizontal ) {
         if ( opaqueOldPos >= 0 )
-            paint.drawRect( opaqueOldPos + hw / 2 - rBord, r.y(),
-                            2 * rBord, r.height() );
+            paint.drawRect( op1, r.y(), op2 - op1 + 1, r.height() );
         if ( p >= 0 )
-            paint.drawRect( p + hw / 2 - rBord, r.y(), 2 * rBord, r.height() );
+            paint.drawRect( p1, r.y(), p2 - p1 + 1, r.height() );
     } else {
         if ( opaqueOldPos >= 0 )
-            paint.drawRect( r.x(), opaqueOldPos + hw / 2 - rBord,
-                            r.width(), 2 * rBord );
+            paint.drawRect( r.x(), op1, r.width(), op2 - op1 + 1 );
         if ( p >= 0 )
-            paint.drawRect( r.x(), p + hw / 2 - rBord, r.width(), 2 * rBord );
+            paint.drawRect( r.x(), p1, r.width(), p2 - p1 + 1 );
     }
     opaqueOldPos = p;