From f1c63398b35d651de54d36fbd2091f07ccf44cc6 Mon Sep 17 00:00:00 2001
From: Michal Lebeda <MichalLebeda@users.noreply.github.com>
Date: Wed, 2 Aug 2023 14:35:53 +0200
Subject: [PATCH 1/2] Add return values to Frame::with_clip() and
 Frame::with_save()

---
 renderer/src/geometry.rs | 16 ++++++++++++----
 wgpu/src/geometry.rs     | 16 ++++++++++++----
 2 files changed, 24 insertions(+), 8 deletions(-)

diff --git a/renderer/src/geometry.rs b/renderer/src/geometry.rs
index 19ac87da2c..cd2140dc33 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 4d7f443ea2..a4d4fb1f84 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`].

From f0a8064fb59e44934f797cef556779b475da6bff Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?H=C3=A9ctor=20Ram=C3=B3n=20Jim=C3=A9nez?= <hector@hecrj.dev>
Date: Wed, 31 Jan 2024 19:02:45 +0100
Subject: [PATCH 2/2] Update `CHANGELOG`

---
 CHANGELOG.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 94d80f0a85..beba84ca6c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -44,6 +44,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Use workspace dependencies and package inheritance. [#2069](https://github.com/iced-rs/iced/pull/2069)
 - Update `wgpu` to `0.17`. [#2065](https://github.com/iced-rs/iced/pull/2065)
 - Support automatic style type casting for `Button`. [#2046](https://github.com/iced-rs/iced/pull/2046)
+- `with_clip` and `with_save` in `Frame` can now return the data of the provided closure. [#1994](https://github.com/iced-rs/iced/pull/1994)
 
 ### Fixed
 - Clipping of `TextInput` selection. [#2199](https://github.com/iced-rs/iced/pull/2199)
@@ -97,6 +98,7 @@ Many thanks to...
 - @joshuamegnauth54
 - @lufte
 - @matze
+- @MichalLebeda
 - @MrAntix
 - @nicksenger
 - @Nisatru