Changeset 62

Timestamp:

Feb 22, 2006, 10:17:33 AM (19 years ago)

Author:

dmik

Message:

Fixed QPainter::drawRoundRect(): the background of rectangles with rounded corners was 1 pixel taller than the frame.

File:

• trunk/src/kernel/qpainter_pm.cpp (modified) (5 diffs)

trunk/src/kernel/qpainter_pm.cpp

@@ -1143 +1143 @@
         }
         qt_geom_line_handle gh;
-        qt_begin_geom_line( hps, COLOR_VALUE(cpen.color()), cpen.style() == NoPen, &gh );
+        qt_begin_geom_line( hps, COLOR_VALUE(cpen.color()),
+                            cpen.style() == NoPen, &gh );
 
         GpiMove( hps, &sptl );
@@ -1309 +1310 @@
 }
 
+static void doDrawRect( HPS hps, int x, int y, int w, int h, int axr, int ayr )
+{
+    const FIXED RightAngle = MAKEFIXED(90,0);
+    const FIXED One = MAKEFIXED(1,0);
+    
+    // top/right coordinates are inclusive
+    -- w;
+    -- h;
+    
+    // beginning of the bottom side
+    POINTL ptl = { x + axr, y };
+    GpiMove( hps, &ptl );
+    // center of the bottom-right arc
+    ptl.x = x + w - axr; ptl.y = y + ayr;
+    GpiPartialArc( hps, &ptl, One, MAKEFIXED(270,0), RightAngle );
+    // center of the top-right arc
+    /* ptl.x = x + w - axr; */ ptl.y = y + h - ayr;
+    GpiPartialArc( hps, &ptl, One, MAKEFIXED(0,0), RightAngle );
+    // center of the top-left arc
+    ptl.x = x + axr; /* ptl.y = y + h - ayr; */
+    GpiPartialArc( hps, &ptl, One, RightAngle, RightAngle );
+    // center of the bottom-left arc
+    /* ptl.x = x + axr; */ ptl.y = y + ayr;
+    GpiPartialArc( hps, &ptl, One, MAKEFIXED(180,0), RightAngle );
+}
 
 void QPainter::drawRectInternal(
@@ -1319 +1345 @@
     }
 
-    POINTL ptl1 = { x, y };
-    if ( devh ) ptl1.y = devh - ( ptl1.y + h );
-    POINTL ptl2 = { x + w - 1, ptl1.y + h - 1 };
-
+    // GpiBox API is buggy when it comes to rounded corners
+    // combined with filling the interior (see ticket:16).
+    // The fix is to draw rounded corners ourselves.
+
+    if ( wRnd == 0 || hRnd == 0 ) { 
+        POINTL ptl1 = { x, y };
+        if ( devh ) ptl1.y = devh - ( ptl1.y + h );
+        POINTL ptl2 = { x + w - 1, ptl1.y + h - 1 };
+        if ( cpen.width() > 1 ) {
+            GpiMove( hps, &ptl1 );
+            GpiBox( hps, DRO_FILL, &ptl2, wRnd, hRnd );
+            qt_geom_line_handle gh;
+            qt_begin_geom_line( hps, COLOR_VALUE(cpen.color()),
+                                cpen.style() == NoPen, &gh );
+            GpiMove( hps, &ptl1 );
+            GpiBox( hps, DRO_OUTLINE, &ptl2, 0, 0 );
+            qt_end_geom_line( hps, &gh );
+        } else {
+            GpiMove( hps, &ptl1 );
+            GpiBox( hps, DRO_FILL | DRO_OUTLINE, &ptl2, 0, 0 );
+        }
+        return;
+    }
+    
+    // flip y coordinate
+    if ( devh ) y = devh - ( y + h );
+
+    int axr = (wRnd - 1) / 2;
+    int ayr = (hRnd - 1) / 2;
+    ARCPARAMS arcparams = { axr, ayr, 0, 0 };
+    GpiSetArcParams( hps, &arcparams );
+    
     if ( cpen.width() > 1 ) {
-        GpiMove( hps, &ptl1 );
-        GpiBox( hps, DRO_FILL, &ptl2, wRnd, hRnd );
+        GpiBeginArea( hps, BA_NOBOUNDARY | BA_ALTERNATE );
+        doDrawRect( hps, x, y, w, h, axr, ayr );
+        GpiEndArea( hps );
         qt_geom_line_handle gh;
-        qt_begin_geom_line( hps, COLOR_VALUE(cpen.color()), cpen.style() == NoPen, &gh );
-        GpiMove( hps, &ptl1 );
-        GpiBox( hps, DRO_OUTLINE, &ptl2, wRnd, hRnd );
+        qt_begin_geom_line( hps, COLOR_VALUE(cpen.color()),
+                            cpen.style() == NoPen, &gh );
+        doDrawRect( hps, x, y, w, h, axr, ayr );
+        GpiCloseFigure( hps );
         qt_end_geom_line( hps, &gh );
     } else {
-        GpiMove( hps, &ptl1 );
-        GpiBox( hps, DRO_FILL | DRO_OUTLINE, &ptl2, wRnd, hRnd );
+        GpiBeginArea( hps, BA_BOUNDARY | BA_ALTERNATE );
+        doDrawRect( hps, x, y, w, h, axr, ayr );
+        GpiEndArea( hps );
     }
 }
@@ -1467 +1524 @@
             if ( w <= 0 || h <= 0 )
                 fix_neg_rect( &x, &y, &w, &h );
-            w--;
-            h--;
             int rxx = w*xRnd/200;
             int ryy = h*yRnd/200;
@@ -1499 +1554 @@
     }
 
-    drawRectInternal( x, y, w, h, w*xRnd/100, h*yRnd/100 );
+    drawRectInternal( x, y, w, h, w*xRnd/99, h*yRnd/99 );
 }