From f9b9be16f96d01ffb0587f65c8c32da9e9e4b3f5 Mon Sep 17 00:00:00 2001
From: Laurenz <laurmaedje@gmail.com>
Date: Thu, 6 Apr 2023 12:25:55 +0200
Subject: Fix box and block sizing

---
 library/src/layout/container.rs | 14 ++++++++++++--
 library/src/layout/flow.rs      |  6 +++++-
 library/src/layout/mod.rs       |  4 ++++
 3 files changed, 21 insertions(+), 3 deletions(-)

(limited to 'library/src/layout')

diff --git a/library/src/layout/container.rs b/library/src/layout/container.rs
index 166d6c09..ef5fbe5d 100644
--- a/library/src/layout/container.rs
+++ b/library/src/layout/container.rs
@@ -132,6 +132,9 @@ impl Layout for BoxElem {
         let pod = Regions::one(size, expand);
         let mut frame = body.layout(vt, styles, pod)?.into_frame();
 
+        // Enforce correct size.
+        *frame.size_mut() = expand.select(size, frame.size());
+
         // Apply baseline shift.
         let shift = self.baseline(styles).relative_to(frame.height());
         if !shift.is_zero() {
@@ -377,10 +380,17 @@ impl Layout for BlockElem {
                 pod.last = None;
             }
 
-            body.layout(vt, styles, pod)?.into_frames()
+            let mut frames = body.layout(vt, styles, pod)?.into_frames();
+            for (frame, &height) in frames.iter_mut().zip(&heights) {
+                *frame.size_mut() =
+                    expand.select(Size::new(size.x, height), frame.size());
+            }
+            frames
         } else {
             let pod = Regions::one(size, expand);
-            body.layout(vt, styles, pod)?.into_frames()
+            let mut frames = body.layout(vt, styles, pod)?.into_frames();
+            *frames[0].size_mut() = expand.select(size, frames[0].size());
+            frames
         };
 
         // Clip the contents
diff --git a/library/src/layout/flow.rs b/library/src/layout/flow.rs
index cd7b1f60..b45c39c2 100644
--- a/library/src/layout/flow.rs
+++ b/library/src/layout/flow.rs
@@ -1,6 +1,8 @@
 use super::{AlignElem, BlockElem, ColbreakElem, ParElem, PlaceElem, Spacing, VElem};
 use crate::prelude::*;
-use crate::visualize::{CircleElem, EllipseElem, ImageElem, RectElem, SquareElem};
+use crate::visualize::{
+    CircleElem, EllipseElem, ImageElem, PathElem, PolygonElem, RectElem, SquareElem,
+};
 
 /// Arrange spacing, paragraphs and block-level elements into a flow.
 ///
@@ -42,6 +44,8 @@ impl Layout for FlowElem {
                 || child.is::<EllipseElem>()
                 || child.is::<CircleElem>()
                 || child.is::<ImageElem>()
+                || child.is::<PolygonElem>()
+                || child.is::<PathElem>()
             {
                 let layoutable = child.with::<dyn Layout>().unwrap();
                 layouter.layout_single(vt, layoutable, styles)?;
diff --git a/library/src/layout/mod.rs b/library/src/layout/mod.rs
index d12ce158..0fed1a34 100644
--- a/library/src/layout/mod.rs
+++ b/library/src/layout/mod.rs
@@ -57,6 +57,8 @@ use crate::meta::DocumentElem;
 use crate::prelude::*;
 use crate::shared::BehavedBuilder;
 use crate::text::{LinebreakElem, SmartQuoteElem, SpaceElem, TextElem};
+use crate::visualize::PathElem;
+use crate::visualize::PolygonElem;
 use crate::visualize::{CircleElem, EllipseElem, ImageElem, RectElem, SquareElem};
 
 /// Root-level layout.
@@ -192,6 +194,8 @@ fn realize_block<'a>(
         && !content.is::<EllipseElem>()
         && !content.is::<CircleElem>()
         && !content.is::<ImageElem>()
+        && !content.is::<PolygonElem>()
+        && !content.is::<PathElem>()
         && !applicable(content, styles)
     {
         return Ok((content.clone(), styles));
-- 
cgit v1.2.3