Changeset 12880

Timestamp:

03/04/08 17:30:40 (9 months ago)

Author:

elazutkin

Message:

gfx.canvas: replacing buggy arcTo with arc until everybody learn

how to implement it. Thx, Chris Mitchell, for the patch (CLA on file).

Files:

• dojox/trunk/gfx/canvas.js (modified) (2 diffs)

dojox/trunk/gfx/canvas.js

@@ -11 +11 @@
 (function(){
         var g = dojox.gfx, gs = g.shape, ga = g.arc, 
-                m = g.matrix, mp = m.multiplyPoint, twoPI = 2 * Math.PI;
+                m = g.matrix, mp = m.multiplyPoint, pi = Math.PI, twoPI = 2 * pi, halfPI = pi /2;
         
         dojo.extend(g.Shape, {
@@ -161 +161 @@
                         ctx.beginPath();
                         ctx.moveTo(xl2, yt);
-                        ctx.lineTo(xr2, yt);
-                        if(r){ ctx.arcTo(xr, yt, xr, yt2, r); }
-                        ctx.lineTo(xr, yb2);
-                        if(r){ ctx.arcTo(xr, yb, xr2, yb, r); }
-                        ctx.lineTo(xl2, yb);
-                        if(r){ ctx.arcTo(xl, yb, xl, yb2, r); }
-                        ctx.lineTo(xl, yt2);
-                        if(r){ ctx.arcTo(xl, yt, xl2, yt, r); }
+                        if(r){
+                                ctx.arc(xr2, yt2, r, -halfPI, 0, false);
+                                ctx.arc(xr2, yb2, r, 0, halfPI, false);
+                                ctx.arc(xl2, yb2, r, halfPI, pi, false);
+                                ctx.arc(xl2, yt2, r, pi, halfPI, false);
+                        }else{
+                                ctx.lineTo(xr2, yt);
+                                ctx.lineTo(xr, yb2);
+                                ctx.lineTo(xl2, yb);
+                                ctx.lineTo(xl, yt2);
+                        }
                         ctx.closePath();
                 }