Pen width, style

Uwe Bonnes bon at elektron.ikp.physik.tu-darmstadt.de
Sun Nov 17 13:42:26 CST 2002


As reported on wine-bugs. This also does gcprevue look better.

Changelog:
	graphics/x11driver/pen.c: X11DRV_SelectPen()
	Don't use a pen with half the width
	graphics/x11driver/graphics: X11DRV_DrawArc()
	Don't overwrite the ENDCAP style
-- 
Uwe Bonnes                bon at elektron.ikp.physik.tu-darmstadt.de

Institut fuer Kernphysik  Schlossgartenstrasse 9  64289 Darmstadt
--------- Tel. 06151 162516 -------- Fax. 06151 164321 ----------
Index: wine/graphics/x11drv/pen.c
===================================================================
RCS file: /home/wine/wine/graphics/x11drv/pen.c,v
retrieving revision 1.15
diff -u -r1.15 pen.c
--- wine/graphics/x11drv/pen.c	3 Apr 2002 02:37:10 -0000	1.15
+++ wine/graphics/x11drv/pen.c	17 Nov 2002 19:38:22 -0000
@@ -47,7 +47,7 @@
     physDev->pen.linejoin = logpen.lopnStyle & PS_JOIN_MASK;
 
     physDev->pen.width = GDI_ROUND((FLOAT)logpen.lopnWidth.x *
-                                   dc->xformWorld2Vport.eM11 * 0.5);
+                                   dc->xformWorld2Vport.eM11);
     if (physDev->pen.width < 0) physDev->pen.width = -physDev->pen.width;
     if (physDev->pen.width == 1) physDev->pen.width = 0;  /* Faster */
     physDev->pen.pixel = X11DRV_PALETTE_ToPhysical( physDev, logpen.lopnColor );
Index: wine/graphics/x11drv/graphics.c
===================================================================
RCS file: /home/wine/wine/graphics/x11drv/graphics.c,v
retrieving revision 1.51
diff -u -r1.51 graphics.c
--- wine/graphics/x11drv/graphics.c	24 Sep 2002 18:36:51 -0000	1.51
+++ wine/graphics/x11drv/graphics.c	17 Nov 2002 19:38:23 -0000
@@ -377,7 +377,6 @@
     }
     if(width == 0) width = 1; /* more accurate */
     physDev->pen.width = width;
-    physDev->pen.endcap = PS_ENDCAP_SQUARE;
 
     xcenter = (rc.right + rc.left) / 2;
     ycenter = (rc.bottom + rc.top) / 2;



More information about the wine-patches mailing list