From 16b63031c15d3469c82a24936494e59c36d4d529 Mon Sep 17 00:00:00 2001
From: Cory Forsstrom <cforsstrom18@gmail.com>
Date: Wed, 23 Feb 2022 10:14:08 -0800
Subject: Add with_clip for canvas

---
 graphics/src/widget/canvas/frame.rs | 24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)

(limited to 'graphics')

diff --git a/graphics/src/widget/canvas/frame.rs b/graphics/src/widget/canvas/frame.rs
index 4873e7fb..01b27451 100644
--- a/graphics/src/widget/canvas/frame.rs
+++ b/graphics/src/widget/canvas/frame.rs
@@ -244,6 +244,30 @@ impl Frame {
         self.transforms.current = self.transforms.previous.pop().unwrap();
     }
 
+    /// TODO...
+    #[inline]
+    pub fn with_clip(
+        &mut self,
+        translation: Vector,
+        size: Size,
+        f: impl FnOnce(&mut Frame),
+    ) {
+        let mut frame = Frame::new(self.size());
+        frame.translate(translation);
+
+        f(&mut frame);
+
+        self.primitives.push(Primitive::Clip {
+            bounds: Rectangle {
+                x: translation.x,
+                y: translation.y,
+                width: size.width,
+                height: size.height,
+            },
+            content: Box::new(frame.into_geometry().into_primitive()),
+        });
+    }
+
     /// Applies a translation to the current transform of the [`Frame`].
     #[inline]
     pub fn translate(&mut self, translation: Vector) {
-- 
cgit 


From f40da376ce1e7a508d8dde85697326b8a0eed373 Mon Sep 17 00:00:00 2001
From: Cory Forsstrom <cforsstrom18@gmail.com>
Date: Wed, 23 Feb 2022 11:36:41 -0800
Subject: Add doc comment

---
 graphics/src/widget/canvas/frame.rs | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

(limited to 'graphics')

diff --git a/graphics/src/widget/canvas/frame.rs b/graphics/src/widget/canvas/frame.rs
index 01b27451..23db843d 100644
--- a/graphics/src/widget/canvas/frame.rs
+++ b/graphics/src/widget/canvas/frame.rs
@@ -244,7 +244,14 @@ impl Frame {
         self.transforms.current = self.transforms.previous.pop().unwrap();
     }
 
-    /// TODO...
+    /// Stores the current transform of the [`Frame`] and executes the given
+    /// drawing operations within a clipped [`Rectange`] at translation / size,
+    /// restoring the transform afterwards.
+    ///
+    /// This method is userful to perform drawing operations that need to be
+    /// clipped.
+    ///
+    /// [`Rectange`]: crate::Rectangle
     #[inline]
     pub fn with_clip(
         &mut self,
-- 
cgit 


From 27e859e1537d62fd7a5f1f4fc4d760a7a39bc804 Mon Sep 17 00:00:00 2001
From: Héctor Ramón Jiménez <hector0193@gmail.com>
Date: Wed, 2 Mar 2022 20:54:24 +0700
Subject: Use `Rectangle` directly in `Frame::with_clip`

---
 graphics/src/widget/canvas/frame.rs | 32 +++++++++++---------------------
 1 file changed, 11 insertions(+), 21 deletions(-)

(limited to 'graphics')

diff --git a/graphics/src/widget/canvas/frame.rs b/graphics/src/widget/canvas/frame.rs
index 23db843d..08518f40 100644
--- a/graphics/src/widget/canvas/frame.rs
+++ b/graphics/src/widget/canvas/frame.rs
@@ -244,34 +244,24 @@ impl Frame {
         self.transforms.current = self.transforms.previous.pop().unwrap();
     }
 
-    /// Stores the current transform of the [`Frame`] and executes the given
-    /// drawing operations within a clipped [`Rectange`] at translation / size,
-    /// restoring the transform afterwards.
+    /// Executes the given drawing operations within a [`Rectangle`] region,
+    /// clipping any geometry that overflows its bounds. Any transformations
+    /// performed are local to the provided closure.
     ///
-    /// This method is userful to perform drawing operations that need to be
+    /// This method is useful to perform drawing operations that need to be
     /// clipped.
-    ///
-    /// [`Rectange`]: crate::Rectangle
     #[inline]
-    pub fn with_clip(
-        &mut self,
-        translation: Vector,
-        size: Size,
-        f: impl FnOnce(&mut Frame),
-    ) {
-        let mut frame = Frame::new(self.size());
-        frame.translate(translation);
+    pub fn with_clip(&mut self, region: Rectangle, f: impl FnOnce(&mut Frame)) {
+        let mut frame = Frame::new(region.size());
 
         f(&mut frame);
 
         self.primitives.push(Primitive::Clip {
-            bounds: Rectangle {
-                x: translation.x,
-                y: translation.y,
-                width: size.width,
-                height: size.height,
-            },
-            content: Box::new(frame.into_geometry().into_primitive()),
+            bounds: region,
+            content: Box::new(Primitive::Translate {
+                translation: Vector::new(region.x, region.y),
+                content: Box::new(frame.into_geometry().into_primitive()),
+            }),
         });
     }
 
-- 
cgit