From 8d94cd4c5c9e33965c24e59fd4710218e346be24 Mon Sep 17 00:00:00 2001
From: Héctor Ramón Jiménez <hector0193@gmail.com>
Date: Wed, 16 Feb 2022 18:09:22 +0700
Subject: Remove redundant `layout.bounds()` calls in `Image` and `Svg`

---
 native/src/widget/image.rs | 11 +++++------
 native/src/widget/svg.rs   | 11 +++++------
 2 files changed, 10 insertions(+), 12 deletions(-)

diff --git a/native/src/widget/image.rs b/native/src/widget/image.rs
index 8ccc7856..6aab76e4 100644
--- a/native/src/widget/image.rs
+++ b/native/src/widget/image.rs
@@ -123,9 +123,8 @@ where
         let (width, height) = renderer.dimensions(&self.handle);
         let image_size = Size::new(width as f32, height as f32);
 
-        let adjusted_fit =
-            self.content_fit.fit(image_size, layout.bounds().size());
         let bounds = layout.bounds();
+        let adjusted_fit = self.content_fit.fit(image_size, bounds.size());
 
         let render = |renderer: &mut Renderer| {
             let offset = Vector::new(
@@ -133,19 +132,19 @@ where
                 (bounds.height - adjusted_fit.height).max(0.0) / 2.0,
             );
 
-            let bounds = Rectangle {
+            let drawing_bounds = Rectangle {
                 width: adjusted_fit.width,
                 height: adjusted_fit.height,
-                ..layout.bounds()
+                ..bounds
             };
 
-            renderer.draw(self.handle.clone(), bounds + offset)
+            renderer.draw(self.handle.clone(), drawing_bounds + offset)
         };
 
         if adjusted_fit.width > bounds.width
             || adjusted_fit.height > bounds.height
         {
-            renderer.with_layer(layout.bounds(), render);
+            renderer.with_layer(bounds, render);
         } else {
             render(renderer)
         }
diff --git a/native/src/widget/svg.rs b/native/src/widget/svg.rs
index 9e3639db..5ce8d25b 100644
--- a/native/src/widget/svg.rs
+++ b/native/src/widget/svg.rs
@@ -120,9 +120,8 @@ where
         let (width, height) = renderer.dimensions(&self.handle);
         let image_size = Size::new(width as f32, height as f32);
 
-        let adjusted_fit =
-            self.content_fit.fit(image_size, layout.bounds().size());
         let bounds = layout.bounds();
+        let adjusted_fit = self.content_fit.fit(image_size, bounds.size());
 
         let render = |renderer: &mut Renderer| {
             let offset = Vector::new(
@@ -130,19 +129,19 @@ where
                 (bounds.height - adjusted_fit.height).max(0.0) / 2.0,
             );
 
-            let bounds = Rectangle {
+            let drawing_bounds = Rectangle {
                 width: adjusted_fit.width,
                 height: adjusted_fit.height,
-                ..layout.bounds()
+                ..bounds
             };
 
-            renderer.draw(self.handle.clone(), bounds + offset)
+            renderer.draw(self.handle.clone(), drawing_bounds + offset)
         };
 
         if adjusted_fit.width > bounds.width
             || adjusted_fit.height > bounds.height
         {
-            renderer.with_layer(layout.bounds(), render);
+            renderer.with_layer(bounds, render);
         } else {
             render(renderer)
         }
-- 
cgit