Better expansion behaviour 🐪

This makes expansion behaviour inheritable by placing it into the area and passing it down during layouting instead of computing some approximation of what we want during execution.

1 files changed, 1 insertions, 5 deletions

diff --git a/src/library/shapes.rs b/src/library/shapes.rs
index 5e638c01..9c466318 100644
--- a/src/library/shapes.rs
+++ b/src/library/shapes.rs
@@ -26,17 +26,13 @@ pub fn box_(ctx: &mut EvalContext, args: &mut ValueArgs) -> Value {
     let color = args.get(ctx, "color");
     let body = args.find::<ValueTemplate>(ctx).unwrap_or_default();
 
-    let fill_if = |c| if c { Expansion::Fill } else { Expansion::Fit };
-    let expand = Spec::new(fill_if(width.is_some()), fill_if(height.is_some()));
-
     Value::template("box", move |ctx| {
         let snapshot = ctx.state.clone();
 
         ctx.set_dirs(Gen::new(main, cross));
 
-        let child = ctx.exec_body(&body, expand);
+        let child = ctx.exec(&body);
         let fixed = NodeFixed { width, height, child };
-
         if let Some(color) = color {
             ctx.push(NodeBackground {
                 fill: Fill::Color(color),