Merge pull request #140 from yWorks/fix-rounded-rects

fix rounded rects when either rx or ry is omitted
yWorks · Jul 17, 2020 · 3979bf9 · 3979bf9
2 parents 9c27339 + 35f9dfe
commit 3979bf9
Show file tree

Hide file tree

Showing 34 changed files with 43 additions and 22 deletions.
diff --git a/src/nodes/rect.ts b/src/nodes/rect.ts
@@ -16,29 +16,36 @@ export class Rect extends GeometryNode {
     if (!isFinite(w) || w <= 0 || !isFinite(h) || h <= 0) {
       return null
     }
-    const MyArc = (4 / 3) * (Math.SQRT2 - 1),
-      rx = Math.min(
-        parseFloat(getAttribute(this.element, context.styleSheets, 'rx') || '0'),
-        w * 0.5
-      ),
-      ry = Math.min(
-        parseFloat(getAttribute(this.element, context.styleSheets, 'ry') || '0'),
-        h * 0.5
-      )
-    let x = parseFloat(getAttribute(this.element, context.styleSheets, 'x') || '0'),
-      y = parseFloat(getAttribute(this.element, context.styleSheets, 'y') || '0')
 
-    return new Path()
-      .moveTo((x += rx), y)
-      .lineTo((x += w - 2 * rx), y)
-      .curveTo(x + rx * MyArc, y, x + rx, y + (ry - ry * MyArc), (x += rx), (y += ry))
-      .lineTo(x, (y += h - 2 * ry))
-      .curveTo(x, y + ry * MyArc, x - rx * MyArc, y + ry, (x -= rx), (y += ry))
-      .lineTo((x += -w + 2 * rx), y)
-      .curveTo(x - rx * MyArc, y, x - rx, y - ry * MyArc, (x -= rx), (y -= ry))
-      .lineTo(x, (y += -h + 2 * ry))
-      .curveTo(x, y - ry * MyArc, x + rx * MyArc, y - ry, (x += rx), (y -= ry))
-      .close()
+    const rxAttr = getAttribute(this.element, context.styleSheets, 'rx')
+    const ryAttr = getAttribute(this.element, context.styleSheets, 'ry')
+    const rx = Math.min(parseFloat(rxAttr || ryAttr || '0'), w * 0.5)
+    const ry = Math.min(parseFloat(ryAttr || rxAttr || '0'), h * 0.5)
+
+    let x = parseFloat(getAttribute(this.element, context.styleSheets, 'x') || '0')
+    let y = parseFloat(getAttribute(this.element, context.styleSheets, 'y') || '0')
+
+    const arc = (4 / 3) * (Math.SQRT2 - 1)
+    if (rx === 0 && ry === 0) {
+      return new Path()
+        .moveTo(x, y)
+        .lineTo(x + w, y)
+        .lineTo(x + w, y + h)
+        .lineTo(x, y + h)
+        .close()
+    } else {
+      return new Path()
+        .moveTo((x += rx), y)
+        .lineTo((x += w - 2 * rx), y)
+        .curveTo(x + rx * arc, y, x + rx, y + (ry - ry * arc), (x += rx), (y += ry))
+        .lineTo(x, (y += h - 2 * ry))
+        .curveTo(x, y + ry * arc, x - rx * arc, y + ry, (x -= rx), (y += ry))
+        .lineTo((x += -w + 2 * rx), y)
+        .curveTo(x - rx * arc, y, x - rx, y - ry * arc, (x -= rx), (y -= ry))
+        .lineTo(x, (y += -h + 2 * ry))
+        .curveTo(x, y - ry * arc, x + rx * arc, y - ry, (x += rx), (y -= ry))
+        .close()
+    }
   }
 
   protected computeNodeTransformCore(context: Context): Matrix {

diff --git a/test/common/tests.js b/test/common/tests.js
@@ -36,6 +36,7 @@ window.tests = [
   'pattern-units',
   'patterns',
   'polyline',
+  'rect',
   'references',
   'remote-images',
   'strokes-and-bounding-boxes',

diff --git a/test/specs/attribute-style-precedence/reference.pdf b/test/specs/attribute-style-precedence/reference.pdf
diff --git a/test/specs/clippath-svg/reference.pdf b/test/specs/clippath-svg/reference.pdf
diff --git a/test/specs/clippath/reference.pdf b/test/specs/clippath/reference.pdf
diff --git a/test/specs/complete-bpmn/reference.pdf b/test/specs/complete-bpmn/reference.pdf
diff --git a/test/specs/complete-computer-network/reference.pdf b/test/specs/complete-computer-network/reference.pdf
diff --git a/test/specs/complete-diagram1/reference.pdf b/test/specs/complete-diagram1/reference.pdf
diff --git a/test/specs/complete-diagram2/reference.pdf b/test/specs/complete-diagram2/reference.pdf
diff --git a/test/specs/complete-flowchart1/reference.pdf b/test/specs/complete-flowchart1/reference.pdf
diff --git a/test/specs/complete-movies/reference.pdf b/test/specs/complete-movies/reference.pdf
diff --git a/test/specs/complete-organization-chart-new/reference.pdf b/test/specs/complete-organization-chart-new/reference.pdf
diff --git a/test/specs/complete-social-network/reference.pdf b/test/specs/complete-social-network/reference.pdf
diff --git a/test/specs/display-none-and-visibility-inheritance/reference.pdf b/test/specs/display-none-and-visibility-inheritance/reference.pdf
diff --git a/test/specs/fill-and-stroke-inheritance/reference.pdf b/test/specs/fill-and-stroke-inheritance/reference.pdf
diff --git a/test/specs/fill-and-stroke-opacity/reference.pdf b/test/specs/fill-and-stroke-opacity/reference.pdf
diff --git a/test/specs/fill-and-stroke-rgba/reference.pdf b/test/specs/fill-and-stroke-rgba/reference.pdf
diff --git a/test/specs/gradient-default-coordinates/reference.pdf b/test/specs/gradient-default-coordinates/reference.pdf
diff --git a/test/specs/gradient-percent-offset/reference.pdf b/test/specs/gradient-percent-offset/reference.pdf
diff --git a/test/specs/gradient-units/reference.pdf b/test/specs/gradient-units/reference.pdf
diff --git a/test/specs/gradients-and-patterns-mixed/reference.pdf b/test/specs/gradients-and-patterns-mixed/reference.pdf
diff --git a/test/specs/hidden-clippath/reference.pdf b/test/specs/hidden-clippath/reference.pdf
diff --git a/test/specs/image-svg-urls/reference.pdf b/test/specs/image-svg-urls/reference.pdf
diff --git a/test/specs/opacity-and-rgba/reference.pdf b/test/specs/opacity-and-rgba/reference.pdf
diff --git a/test/specs/pattern-units/reference.pdf b/test/specs/pattern-units/reference.pdf
diff --git a/test/specs/patterns/reference.pdf b/test/specs/patterns/reference.pdf
diff --git a/test/specs/rect/reference.pdf b/test/specs/rect/reference.pdf
diff --git a/test/specs/rect/spec.svg b/test/specs/rect/spec.svg
diff --git a/test/specs/references/reference.pdf b/test/specs/references/reference.pdf
diff --git a/test/specs/remote-images/reference.pdf b/test/specs/remote-images/reference.pdf
diff --git a/test/specs/symbols/reference.pdf b/test/specs/symbols/reference.pdf
diff --git a/test/specs/transforms-parsing/reference.pdf b/test/specs/transforms-parsing/reference.pdf
diff --git a/test/specs/url-references-with-quotes/reference.pdf b/test/specs/url-references-with-quotes/reference.pdf
diff --git a/test/specs/zero-width-strokes/reference.pdf b/test/specs/zero-width-strokes/reference.pdf