Mercurial > dwindows

changeset 1650:1f35129e4817

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Improved arc drawing on the Mac using the same method as GDI+ on Windows.
author bsmith@81767d24-ef19-dc11-ae90-00e081727c95
date Sat, 07 Apr 2012 18:03:38 +0000
parents 509effb15e35
children 2d5d3a11dee4
files mac/dw.m
diffstat 1 files changed, 12 insertions(+), 12 deletions(-) [+]
line wrap: on
line diff
--- a/mac/dw.m	Sat Apr 07 03:54:24 2012 +0000
+++ b/mac/dw.m	Sat Apr 07 18:03:38 2012 +0000
@@ -5677,7 +5677,6 @@
     DW_LOCAL_POOL_IN;
     DW_MUTEX_LOCK;
     id image = handle;
-    double r, a1, a2, a;
     
     if(pixmap)
     {
@@ -5708,18 +5707,19 @@
     }
     else
     {
-        [aPath moveToPoint:NSMakePoint(x1, y1)];
-        /* Calculate the midpoint */
-        r = 0.5 * (hypot((double)(y1 - yorigin), (double)(x1 - xorigin)) +
-                   hypot((double)(y2 - yorigin), (double)(x2 - xorigin)));
-        a1 = atan2((double)(y1 - yorigin), (double)(x1 - xorigin));
-        a2 = atan2((double)(y2 - yorigin), (double)(x2 - xorigin));
-        if(a2 < a1)
-            a2 += M_PI * 2;
-        a = (a1 + a2) / 2.;
+        double a1 = atan2((y1-yorigin), (x1-xorigin));
+        double a2 = atan2((y2-yorigin), (x2-xorigin));
+        double dx = xorigin - x1;
+        double dy = yorigin - y1;
+        double r = sqrt(dx*dx + dy*dy);
+        
+        /* Convert to degrees */
+        a1 *= (180.0 / M_PI);
+        a2 *= (180.0 / M_PI);
+        
         /* Prepare to draw */
-        [aPath appendBezierPathWithArcFromPoint:NSMakePoint((xorigin + r * cos(a)), (yorigin + r * sin(a)))
-                                        toPoint:NSMakePoint(x2, y2) radius:r];
+        [aPath appendBezierPathWithArcWithCenter:NSMakePoint(xorigin, yorigin)
+                                          radius:r startAngle:a1 endAngle:a2];
     }
     /* If the fill flag is passed */
     if(flags & DW_DRAW_FILL)