Merge `rect` and `box` 🦚

4 files changed, 31 insertions, 30 deletions

diff --git a/tests/library/ref/geom.png b/tests/library/ref/box.png
index 37fd7d27..37fd7d27 100644
--- a/tests/library/ref/geom.png
+++ b/tests/library/ref/box.png
diff --git a/tests/library/typ/box.typ b/tests/library/typ/box.typ
new file mode 100644
index 00000000..03e5da54
--- /dev/null
+++ b/tests/library/typ/box.typ
@@ -0,0 +1,23 @@
+#[page "a5", flip: true]
+
+// Rectangle with width, should have paragraph height
+#[box width: 2cm, color: #9650D6][aa]
+
+Sometimes there is no box
+
+// Rectangle with height, should span line
+#[box height: 2cm, width: 100%, color: #734CED][bb]
+
+// Empty rectangle with width and height
+#[box width: 6cm, height: 12pt, color: #CB4CED]
+
+// This empty rectangle should not be displayed
+#[box width: 2in, color: #ff0000]
+
+// This one should be
+#[box height: 15mm, width: 100%, color: #494DE3]
+
+// These are in a row!
+#[box width: 2in, height: 10pt, color: #D6CD67]
+#[box width: 2in, height: 10pt, color: #EDD466]
+#[box width: 2in, height: 10pt, color: #E3BE62]
diff --git a/tests/library/typ/geom.typ b/tests/library/typ/geom.typ
deleted file mode 100644
index 26ba7ca3..00000000
--- a/tests/library/typ/geom.typ
+++ /dev/null
@@ -1,23 +0,0 @@
-#[page "a5", flip: true]
-
-// Rectangle with width, should have paragraph height
-#[rect width: 2cm, color: #9650D6][aa]
-
-Sometimes there is no box
-
-// Rectangle with height, should span line
-#[rect height: 2cm, color: #734CED][bb]
-
-// Empty rectangle with width and height
-#[rect width: 6cm, height: 12pt, color: #CB4CED]
-
-// This empty rectangle should not be displayed
-#[rect width: 2in, color: #ff0000]
-
-// This one should be
-#[rect height: 15mm, color: #494DE3]
-
-// These are in a row!
-#[rect width: 2in, height: 10pt, color: #D6CD67]
-#[rect width: 2in, height: 10pt, color: #EDD466]
-#[rect width: 2in, height: 10pt, color: #E3BE62]
diff --git a/tests/typeset.rs b/tests/typeset.rs
index 432941ce..b1f4ede2 100644
--- a/tests/typeset.rs
+++ b/tests/typeset.rs
@@ -451,10 +451,6 @@ fn draw_geometry(canvas: &mut Canvas, pos: Point, _: &Env, element: &Geometry) {
     let x = pos.x.to_pt() as f32;
     let y = pos.y.to_pt() as f32;
 
-    let (w, h) = match &element.shape {
-        Shape::Rect(s) => (s.size.width.to_pt() as f32, s.size.height.to_pt() as f32),
-    };
-
     let mut paint = Paint::default();
 
     match &element.fill {
@@ -464,9 +460,14 @@ fn draw_geometry(canvas: &mut Canvas, pos: Point, _: &Env, element: &Geometry) {
         Fill::Image(_) => todo!(),
     };
 
-    if let Some(rect) = Rect::from_xywh(x, y, w, h) {
-        canvas.fill_rect(rect, &paint);
-    }
+    match &element.shape {
+        Shape::Rect(s) => {
+            let (w, h) = (s.width.to_pt() as f32, s.height.to_pt() as f32);
+            canvas.fill_rect(Rect::from_xywh(x, y, w, h).unwrap(), &paint);
+        },
+    };
+
+
 }
 
 fn draw_image(canvas: &mut Canvas, pos: Point, env: &Env, element: &Image) {