Refactor layouting a bit

Notably:
- Handle aspect ratio in fixed node
- Inline constraint inflation into pad node

1 files changed, 3 insertions, 4 deletions

diff --git a/src/layout/image.rs b/src/layout/image.rs
index 2c20642b..02a907f5 100644
--- a/src/layout/image.rs
+++ b/src/layout/image.rs
@@ -19,11 +19,10 @@ impl Layout for ImageNode {
     fn layout(
         &self,
         ctx: &mut LayoutContext,
-        regions: &Regions,
+        &Regions { current, base, expand, .. }: &Regions,
     ) -> Vec<Constrained<Rc<Frame>>> {
-        let Regions { current, base, .. } = regions;
-        let mut constraints = Constraints::new(regions.expand);
-        constraints.set_base_using_linears(Spec::new(self.width, self.height), regions);
+        let mut constraints = Constraints::new(expand);
+        constraints.set_base_if_linear(base, Spec::new(self.width, self.height));
 
         let width = self.width.map(|w| w.resolve(base.width));
         let height = self.height.map(|w| w.resolve(base.height));