From f1c63398b35d651de54d36fbd2091f07ccf44cc6 Mon Sep 17 00:00:00 2001 From: Michal Lebeda Date: Wed, 2 Aug 2023 14:35:53 +0200 Subject: Add return values to Frame::with_clip() and Frame::with_save() --- wgpu/src/geometry.rs | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) (limited to 'wgpu/src/geometry.rs') 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(&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( + &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`]. -- cgit