From 0655a20ad119e2e9790afcc45039fd4ac0e7d432 Mon Sep 17 00:00:00 2001
From: Héctor Ramón Jiménez <hector0193@gmail.com>
Date: Thu, 16 Mar 2023 20:23:25 +0100
Subject: Make `Shrink` have priority over `Fill` in layout

---
 widget/src/image/viewer.rs | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

(limited to 'widget/src/image')

diff --git a/widget/src/image/viewer.rs b/widget/src/image/viewer.rs
index 68015ba8..23c4fe86 100644
--- a/widget/src/image/viewer.rs
+++ b/widget/src/image/viewer.rs
@@ -113,10 +113,11 @@ where
     ) -> layout::Node {
         let Size { width, height } = renderer.dimensions(&self.handle);
 
-        let mut size = limits
-            .width(self.width)
-            .height(self.height)
-            .resolve(Size::new(width as f32, height as f32));
+        let mut size = limits.resolve(
+            Size::new(width as f32, height as f32),
+            self.width,
+            self.height,
+        );
 
         let expansion_size = if height > width {
             self.width
-- 
cgit 


From d278bfd21d0399009e652560afb9a4d185e92637 Mon Sep 17 00:00:00 2001
From: Héctor Ramón Jiménez <hector@hecrj.dev>
Date: Fri, 5 Jan 2024 17:46:33 +0100
Subject: Replace `width` and `height` with `Widget::size`

---
 widget/src/image/viewer.rs | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

(limited to 'widget/src/image')

diff --git a/widget/src/image/viewer.rs b/widget/src/image/viewer.rs
index 23c4fe86..dc910f1f 100644
--- a/widget/src/image/viewer.rs
+++ b/widget/src/image/viewer.rs
@@ -97,12 +97,11 @@ where
         tree::State::new(State::new())
     }
 
-    fn width(&self) -> Length {
-        self.width
-    }
-
-    fn height(&self) -> Length {
-        self.height
+    fn size(&self) -> Size<Length> {
+        Size {
+            width: self.width,
+            height: self.height,
+        }
     }
 
     fn layout(
-- 
cgit 


From d62bb8193c1c43f565fcc5c52293d564c91e215d Mon Sep 17 00:00:00 2001
From: Héctor Ramón Jiménez <hector@hecrj.dev>
Date: Tue, 9 Jan 2024 06:35:33 +0100
Subject: Introduce useful helpers in `layout` module

---
 widget/src/image/viewer.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'widget/src/image')

diff --git a/widget/src/image/viewer.rs b/widget/src/image/viewer.rs
index dc910f1f..98080577 100644
--- a/widget/src/image/viewer.rs
+++ b/widget/src/image/viewer.rs
@@ -113,9 +113,9 @@ where
         let Size { width, height } = renderer.dimensions(&self.handle);
 
         let mut size = limits.resolve(
-            Size::new(width as f32, height as f32),
             self.width,
             self.height,
+            Size::new(width as f32, height as f32),
         );
 
         let expansion_size = if height > width {
-- 
cgit