Add return values to Frame::with_clip() and Frame::with_save()

2 files changed, 24 insertions, 8 deletions

diff --git a/renderer/src/geometry.rs b/renderer/src/geometry.rs
index 19ac87da..cd2140dc 100644
--- a/renderer/src/geometry.rs
+++ b/renderer/src/geometry.rs
@@ -111,12 +111,14 @@ impl Frame {
     /// This method is useful to compose transforms and perform drawing
     /// operations in different coordinate systems.
     #[inline]
-    pub fn with_save(&mut self, f: impl FnOnce(&mut Frame)) {
+    pub fn with_save<R>(&mut self, f: impl FnOnce(&mut Frame) -> R) -> R {
         delegate!(self, frame, frame.push_transform());
 
-        f(self);
+        let result = f(self);
 
         delegate!(self, frame, frame.pop_transform());
+
+        result
     }
 
     /// Executes the given drawing operations within a [`Rectangle`] region,
@@ -126,7 +128,11 @@ impl Frame {
     /// This method is useful to perform drawing operations that need to be
     /// clipped.
     #[inline]
-    pub fn with_clip(&mut self, region: Rectangle, f: impl FnOnce(&mut Frame)) {
+    pub fn with_clip<R>(
+        &mut self,
+        region: Rectangle,
+        f: impl FnOnce(&mut Frame) -> R,
+    ) -> R {
         let mut frame = match self {
             Self::TinySkia(_) => Self::TinySkia(
                 iced_tiny_skia::geometry::Frame::new(region.size()),
@@ -137,7 +143,7 @@ impl Frame {
             }
         };
 
-        f(&mut frame);
+        let result = f(&mut frame);
 
         let origin = Point::new(region.x, region.y);
 
@@ -152,6 +158,8 @@ impl Frame {
             #[allow(unreachable_patterns)]
             _ => unreachable!(),
         };
+
+        result
     }
 
     /// Applies a translation to the current transform of the [`Frame`].
diff --git a/wgpu/src/geometry.rs b/wgpu/src/geometry.rs
index 4d7f443e..a4d4fb1f 100644
--- a/wgpu/src/geometry.rs
+++ b/wgpu/src/geometry.rs
@@ -388,12 +388,14 @@ impl Frame {
     /// This method is useful to compose transforms and perform drawing
     /// operations in different coordinate systems.
     #[inline]
-    pub fn with_save(&mut self, f: impl FnOnce(&mut Frame)) {
+    pub fn with_save<R>(&mut self, f: impl FnOnce(&mut Frame) -> R) -> R {
         self.push_transform();
 
-        f(self);
+        let result = f(self);
 
         self.pop_transform();
+
+        result
     }
 
     /// Pushes the current transform in the transform stack.
@@ -413,14 +415,20 @@ impl Frame {
     /// This method is useful to perform drawing operations that need to be
     /// clipped.
     #[inline]
-    pub fn with_clip(&mut self, region: Rectangle, f: impl FnOnce(&mut Frame)) {
+    pub fn with_clip<R>(
+        &mut self,
+        region: Rectangle,
+        f: impl FnOnce(&mut Frame) -> R,
+    ) -> R {
         let mut frame = Frame::new(region.size());
 
-        f(&mut frame);
+        let result = f(&mut frame);
 
         let origin = Point::new(region.x, region.y);
 
         self.clip(frame, origin);
+
+        result
     }
 
     /// Draws the clipped contents of the given [`Frame`] with origin at the given [`Point`].