Reorganize modules

Instead of separating functionality into layout and library, everything lives in the library now. This way, related things live side by side and there are no duplicate file names in the two directories.

1 files changed, 0 insertions, 106 deletions

diff --git a/src/layout/shape.rs b/src/layout/shape.rs
deleted file mode 100644
index ed70dd95..00000000
--- a/src/layout/shape.rs
+++ /dev/null
@@ -1,106 +0,0 @@
-use std::f64::consts::SQRT_2;
-
-use super::*;
-use crate::util::RcExt;
-
-/// Places its child into a sizable and fillable shape.
-#[derive(Debug, Hash)]
-pub struct ShapeNode {
-    /// Which shape to place the child into.
-    pub shape: ShapeKind,
-    /// The width, if any.
-    pub width: Option<Linear>,
-    /// The height, if any.
-    pub height: Option<Linear>,
-    /// How to fill the shape, if at all.
-    pub fill: Option<Paint>,
-    /// The child node to place into the shape, if any.
-    pub child: Option<BlockNode>,
-}
-
-/// The type of a shape.
-#[derive(Debug, Copy, Clone, Eq, PartialEq, Hash)]
-pub enum ShapeKind {
-    /// A rectangle with equal side lengths.
-    Square,
-    /// A quadrilateral with four right angles.
-    Rect,
-    /// An ellipse with coinciding foci.
-    Circle,
-    /// A curve around two focal points.
-    Ellipse,
-}
-
-impl InlineLevel for ShapeNode {
-    fn layout(&self, ctx: &mut LayoutContext, space: Length, base: Size) -> Frame {
-        // Resolve width and height relative to the region's base.
-        let width = self.width.map(|w| w.resolve(base.w));
-        let height = self.height.map(|h| h.resolve(base.h));
-
-        // Layout.
-        let mut frame = if let Some(child) = &self.child {
-            let mut node: &dyn BlockLevel = child;
-
-            let padded;
-            if matches!(self.shape, ShapeKind::Circle | ShapeKind::Ellipse) {
-                // Padding with this ratio ensures that a rectangular child fits
-                // perfectly into a circle / an ellipse.
-                padded = PadNode {
-                    padding: Sides::splat(Relative::new(0.5 - SQRT_2 / 4.0).into()),
-                    child: child.clone(),
-                };
-                node = &padded;
-            }
-
-            // The "pod" is the region into which the child will be layouted.
-            let mut pod = {
-                let size = Size::new(width.unwrap_or(space), height.unwrap_or(base.h));
-
-                let base = Size::new(
-                    if width.is_some() { size.w } else { base.w },
-                    if height.is_some() { size.h } else { base.h },
-                );
-
-                let expand = Spec::new(width.is_some(), height.is_some());
-                Regions::one(size, base, expand)
-            };
-
-            // Now, layout the child.
-            let mut frames = node.layout(ctx, &pod);
-
-            if matches!(self.shape, ShapeKind::Square | ShapeKind::Circle) {
-                // Relayout with full expansion into square region to make sure
-                // the result is really a square or circle.
-                let size = frames[0].item.size;
-                pod.current.w = size.w.max(size.h).min(pod.current.w);
-                pod.current.h = pod.current.w;
-                pod.expand = Spec::splat(true);
-                frames = node.layout(ctx, &pod);
-            }
-
-            // Validate and set constraints.
-            assert_eq!(frames.len(), 1);
-            Rc::take(frames.into_iter().next().unwrap().item)
-        } else {
-            // Resolve shape size.
-            let size = Size::new(width.unwrap_or_default(), height.unwrap_or_default());
-            Frame::new(size, size.h)
-        };
-
-        // Add background shape if desired.
-        if let Some(fill) = self.fill {
-            let (pos, geometry) = match self.shape {
-                ShapeKind::Square | ShapeKind::Rect => {
-                    (Point::zero(), Geometry::Rect(frame.size))
-                }
-                ShapeKind::Circle | ShapeKind::Ellipse => {
-                    (frame.size.to_point() / 2.0, Geometry::Ellipse(frame.size))
-                }
-            };
-
-            frame.prepend(pos, Element::Geometry(geometry, fill));
-        }
-
-        frame
-    }
-}