Store rect within PixmapScaling

Author: dhardy

crates/kas-core/src/layout/size_types.rs

@@ -238,6 +238,8 @@ impl_scope! {
         ///
         /// If is `None`, max size is limited to ideal size.
         pub stretch: Stretch,
+        /// The assigned [`Rect`]
+        pub rect: Rect,
     }
 }
 
@@ -260,7 +262,7 @@ impl PixmapScaling {
     /// Constrains and aligns within `rect`
     ///
     /// The resulting size is then aligned using the `align` hints, defaulting to centered.
-    pub fn align_rect(&mut self, rect: Rect, align: AlignPair, scale_factor: f32) -> Rect {
+    pub fn set_rect(&mut self, rect: Rect, align: AlignPair, scale_factor: f32) {
         let mut size = rect.size;
 
         if self.stretch == Stretch::None {
@@ -280,7 +282,7 @@ impl PixmapScaling {
             }
         }
 
-        align.aligned_rect(size, rect)
+        self.rect = align.aligned_rect(size, rect);
     }
 }
 

crates/kas-resvg/src/canvas.rs

@@ -160,16 +160,20 @@ impl_scope! {
     }
 
     impl Layout for Self {
+        fn rect(&self) -> Rect {
+            self.scaling.rect
+        }
+
         fn size_rules(&mut self, sizer: SizeCx, axis: AxisInfo) -> SizeRules {
             self.scaling.size_rules(sizer, axis)
         }
 
         fn set_rect(&mut self, cx: &mut ConfigCx, rect: Rect, hints: AlignHints) {
             let align = hints.complete_default();
             let scale_factor = cx.size_cx().scale_factor();
-            widget_set_rect!(self.scaling.align_rect(rect, align, scale_factor));
-            let size = self.rect().size.cast();
+            self.scaling.set_rect(rect, align, scale_factor);
 
+            let size = self.rect().size.cast();
             if let Some(fut) = self.inner.get_mut().resize(size) {
                 cx.push_spawn(self.id(), fut);
             }

crates/kas-resvg/src/svg.rs

@@ -242,16 +242,20 @@ impl_scope! {
     }
 
     impl Layout for Self {
+        fn rect(&self) -> Rect {
+            self.scaling.rect
+        }
+
         fn size_rules(&mut self, sizer: SizeCx, axis: AxisInfo) -> SizeRules {
             self.scaling.size_rules(sizer, axis)
         }
 
         fn set_rect(&mut self, cx: &mut ConfigCx, rect: Rect, hints: AlignHints) {
             let align = hints.complete_default();
             let scale_factor = cx.size_cx().scale_factor();
-            widget_set_rect!(self.scaling.align_rect(rect, align, scale_factor));
-            let size: (u32, u32) = self.rect().size.cast();
+            self.scaling.set_rect(rect, align, scale_factor);
 
+            let size: (u32, u32) = self.rect().size.cast();
             if let Some(fut) = self.inner.resize(size) {
                 cx.push_spawn(self.id(), fut);
             }

crates/kas-widgets/src/image.rs

@@ -167,14 +167,18 @@ impl_scope! {
     }
 
     impl Layout for Image {
+        fn rect(&self) -> Rect {
+            self.scaling.rect
+        }
+
         fn size_rules(&mut self, sizer: SizeCx, axis: AxisInfo) -> SizeRules {
             self.scaling.size_rules(sizer, axis)
         }
 
         fn set_rect(&mut self, cx: &mut ConfigCx, rect: Rect, hints: AlignHints) {
             let align = hints.complete_default();
             let scale_factor = cx.size_cx().scale_factor();
-            widget_set_rect!(self.scaling.align_rect(rect, align, scale_factor));
+            self.scaling.set_rect(rect, align, scale_factor);
         }
 
         fn draw(&self, mut draw: DrawCx) {