graphics: add Graphics.clipRoundRect

src/doc/docIntro/doc/ChangeLog.fandoc

@@ -6,6 +6,8 @@
 ** license:    Licensed under the Academic Free License version 3.0
 **************************************************************************
 
+*Build 1.0.80 (working)*
+
 *Build 1.0.79 (17 Jul 2023)*
 - New yaml API
 - Zip.readEach, Zip.unzipInto

src/dom/fan/CanvasGraphics.fan

@@ -42,6 +42,8 @@ internal native class CanvasGraphics : Graphics
 
   override native This fillRoundRect(Float x, Float y, Float w, Float h, Float wArc, Float hArc)
 
+  override native This clipRoundRect(Float x, Float y, Float w, Float h, Float wArc, Float hArc)
+
   override native This drawText(Str s, Float x, Float y)
 
   override native This drawImage(Image img, Float x, Float y, Float w := img.w, Float h := img.h)

src/dom/js/CanvasGraphics.js

@@ -148,6 +148,14 @@ fan.dom.CanvasGraphics.prototype.fillRoundRect = function(x, y, w, h, wArc, hArc
   return this;
 }
 
+// This clipRoundRect(Float x, Float y, Float w, Float h, Float wArc, Float hArc)
+fan.dom.CanvasGraphics.prototype.clipRoundRect = function(x, y, w, h, wArc, hArc)
+{
+  this.pathRoundRect(x, y, w, h, wArc, hArc);
+  this.cx.clip();
+  return this;
+}
+
 // generate path for a rounded rectangle
 fan.dom.CanvasGraphics.prototype.pathRoundRect = function(x, y, w, h, wArc, hArc)
 {

src/graphics/fan/Graphics.fan

@@ -58,6 +58,10 @@ mixin Graphics
   ** The ellipse of the corners is specified by wArc and hArc.
   abstract This fillRoundRect(Float x, Float y, Float w, Float h, Float wArc, Float hArc)
 
+  ** Clip a rectangle with rounded corners with the current paint.
+  ** The ellipse of the corners is specified by wArc and hArc.
+  abstract This clipRoundRect(Float x, Float y, Float w, Float h, Float wArc, Float hArc)
+
   ** Draw a the text string with the current paint and font.  The x, y
   ** coordinate specifies the left baseline corner of where the text
   ** is to be drawn.  Technically this is a fill operation similiar to

src/graphicsJava/fan/java2D/Java2DGraphics.fan

@@ -183,6 +183,14 @@ class Java2DGraphics : Graphics
     return this
   }
 
+  ** Clip a rectangle with rounded corners with the current paint.
+  ** The ellipse of the corners is specified by wArc and hArc.
+  override This clipRoundRect(Float x, Float y, Float w, Float h, Float wArc, Float hArc)
+  {
+    g.clip(RoundRectangle2D(x, y, w, h, wArc, hArc))
+    return this
+  }
+
   ** Draw a the text string with the current fill and font.
   ** The x, y coordinate specifies the top left corner of
   ** the rectangular area where the text is to be drawn.

src/testGraphics/fan/ClipTest.fan

@@ -16,25 +16,31 @@ class ClipTest : AbstractTest
     drawStuff(g)
 
     g.push
-    g.translate(250f, 0f)
+    g.translate(200f, 0f)
     g.path.arc(120f, 120f, 75f, 0f, 360f).clip
     drawStuff(g)
     g.pop
 
     g.push
-    g.translate(450f, 0f)
+    g.translate(400f, 0f)
     g.clipRect(45f, 45f, 150f, 150f)
     drawStuff(g)
     g.pop
+
+    g.push
+    g.translate(600f, 0f)
+    g.clipRoundRect(45f, 45f, 150f, 150f, 50f, 50f)
+    drawStuff(g)
+    g.pop
   }
 
   static Void drawStuff(Graphics g)
   {
     g.color = Color("darkorange")
-    g.fillRect(20f, 20f, 220f, 220f)
+    g.fillRect(20f, 20f, 200f, 200f)
     g.font = Font("24pt Times")
     g.color = Color("Blue")
-    g.drawText("Clip this text!", 35f, 130f)
+    g.drawText("Clip this text!", 30f, 120f)
    }
 
 }