summaryrefslogtreecommitdiff
path: root/src/layout/mod.rs
diff options
context:
space:
mode:
authorLaurenz <laurmaedje@gmail.com>2019-06-21 21:37:29 +0200
committerLaurenz <laurmaedje@gmail.com>2019-06-21 21:41:02 +0200
commit968e121697a96a2e3b05a560176c34f4bb6693c3 (patch)
treeb937cf208d7a8bfb318227a46e44f91da4ef7a49 /src/layout/mod.rs
parentb53ad6b1ec8b2fd05566a83c9b895f265e61d281 (diff)
Implement flex and box layouting 📏
Diffstat (limited to 'src/layout/mod.rs')
-rw-r--r--src/layout/mod.rs184
1 files changed, 137 insertions, 47 deletions
diff --git a/src/layout/mod.rs b/src/layout/mod.rs
index 8b0c3004..64eeb00a 100644
--- a/src/layout/mod.rs
+++ b/src/layout/mod.rs
@@ -1,28 +1,20 @@
//! The layouting engine.
+use crate::doc::TextAction;
use crate::font::{FontLoader, FontError};
-use crate::size::{Size2D, SizeBox};
+use crate::size::{Size, Size2D, SizeBox};
use crate::syntax::{SyntaxTree, Node};
use crate::style::TextStyle;
-mod boxed;
-mod flex;
+use self::flex::{FlexLayout, FlexContext};
+use self::boxed::{BoxLayout, BoxContext, BoxLayouter};
+use self::text::TextContext;
-pub use flex::{FlexLayout, FlexLayouter};
-pub use boxed::{BoxLayout, BoxLayouter};
+pub mod text;
+pub mod boxed;
+pub mod flex;
-/// Types that layout components and can be finished into some kind of layout.
-pub trait Layouter {
- type Layout;
-
- /// Finish the layouting and create the layout from this.
- fn finish(self) -> Self::Layout;
-
- /// Whether this layouter contains any items.
- fn is_empty(&self) -> bool;
-}
-
/// A collection of layouted content.
#[derive(Debug, Clone)]
pub enum Layout {
@@ -44,54 +36,152 @@ pub struct LayoutContext<'a, 'p> {
}
/// Spacial constraints for layouting.
-#[derive(Debug, Clone)]
+#[derive(Debug, Copy, Clone)]
pub struct LayoutSpace {
/// The maximum size of the box to layout in.
pub dimensions: Size2D,
/// Padding that should be respected on each side.
pub padding: SizeBox,
+ /// Whether to shrink the dimensions to fit the content or the keep the
+ /// original ones.
+ pub shrink_to_fit: bool,
+}
+
+impl LayoutSpace {
+ /// The actually usable area.
+ pub fn usable(&self) -> Size2D {
+ Size2D {
+ x: self.dimensions.x - self.padding.left - self.padding.right,
+ y: self.dimensions.y - self.padding.top - self.padding.bottom,
+ }
+ }
}
/// Layout a syntax tree in a given context.
pub fn layout(tree: &SyntaxTree, ctx: &LayoutContext) -> LayoutResult<BoxLayout> {
- // The top-level layouter and the sub-level layouter.
- let mut box_layouter = BoxLayouter::new(ctx);
- let mut flex_layouter = FlexLayouter::new(ctx);
-
- // The current text style.
- let mut italic = false;
- let mut bold = false;
-
- // Walk all nodes and layout them.
- for node in &tree.nodes {
- match node {
- Node::Text(text) => {
- unimplemented!()
- },
- Node::Space => {
- unimplemented!()
- },
- Node::Newline => {
- unimplemented!()
- },
+ Layouter::new(tree, ctx).layout()
+}
+
+/// Transforms a syntax tree into a box layout.
+#[derive(Debug)]
+struct Layouter<'a, 'p> {
+ tree: &'a SyntaxTree,
+ box_layouter: BoxLayouter,
+ flex_layout: FlexLayout,
+ flex_ctx: FlexContext,
+ text_ctx: TextContext<'a, 'p>,
+}
- // Toggle the text styles.
- Node::ToggleItalics => italic = !italic,
- Node::ToggleBold => bold = !bold,
+impl<'a, 'p> Layouter<'a, 'p> {
+ /// Create a new layouter.
+ fn new(tree: &'a SyntaxTree, ctx: &LayoutContext<'a, 'p>) -> Layouter<'a, 'p> {
+ // The top-level context for arranging paragraphs.
+ let box_ctx = BoxContext { space: ctx.space };
+
+ // The sub-level context for arranging pieces of text.
+ let flex_ctx = FlexContext {
+ space: LayoutSpace {
+ dimensions: ctx.space.usable(),
+ padding: SizeBox::zero(),
+ shrink_to_fit: true,
+ },
+ flex_spacing: ctx.style.line_spacing,
+ };
+
+ // The mutable context for layouting single pieces of text.
+ let text_ctx = TextContext {
+ loader: &ctx.loader,
+ style: ctx.style.clone(),
+ };
+
+ Layouter {
+ tree,
+ box_layouter: BoxLayouter::new(box_ctx),
+ flex_layout: FlexLayout::new(flex_ctx),
+ flex_ctx,
+ text_ctx,
+ }
+ }
- Node::Func(func) => {
- unimplemented!()
+ /// Layout the tree into a box.
+ fn layout(mut self) -> LayoutResult<BoxLayout> {
+ // Walk all nodes and layout them.
+ for node in &self.tree.nodes {
+ match node {
+ // Layout a single piece of text.
+ Node::Text(text) => {
+ let boxed = self::text::layout(text, &self.text_ctx)?;
+ self.flex_layout.add_box(boxed);
+ },
+ Node::Space => {
+ if !self.flex_layout.is_empty() {
+ let boxed = self::text::layout(" ", &self.text_ctx)?;
+ self.flex_layout.add_glue(boxed);
+ }
+ },
+
+ // Finish the current flex layout and add it to the box layouter.
+ // Then start a new flex layouting process.
+ Node::Newline => {
+ // Finish the current paragraph into a box and add it.
+ self.add_paragraph_spacing();
+ let boxed = self.flex_layout.into_box();
+ self.box_layouter.add_box(boxed);
+
+ // Create a fresh flex layout for the next paragraph.
+ self.flex_ctx.space.dimensions = self.box_layouter.remaining();
+ self.flex_layout = FlexLayout::new(self.flex_ctx);
+ },
+
+ // Toggle the text styles.
+ Node::ToggleItalics => self.text_ctx.style.italic = !self.text_ctx.style.italic,
+ Node::ToggleBold => self.text_ctx.style.bold = !self.text_ctx.style.bold,
+
+ // Execute a function.
+ Node::Func(_) => unimplemented!(),
}
}
+
+ // If there are remainings, add them to the layout.
+ if !self.flex_layout.is_empty() {
+ self.add_paragraph_spacing();
+ let boxed = self.flex_layout.into_box();
+ self.box_layouter.add_box(boxed);
+ }
+
+ Ok(self.box_layouter.finish())
}
- // If there are remainings, add them to the layout.
- if !flex_layouter.is_empty() {
- let boxed = flex_layouter.finish().into_box();
- box_layouter.add_box(boxed);
+ /// Add the spacing between two paragraphs.
+ fn add_paragraph_spacing(&mut self) {
+ let size = Size::points(self.text_ctx.style.font_size)
+ * (self.text_ctx.style.line_spacing * self.text_ctx.style.paragraph_spacing - 1.0);
+ self.box_layouter.add_space(size);
}
+}
+
+/// Translate a stream of text actions by an offset.
+pub fn translate_actions<I>(offset: Size2D, actions: I) -> TranslatedActions<I::IntoIter>
+ where I: IntoIterator<Item=TextAction> {
+ TranslatedActions { offset, iter: actions.into_iter() }
+}
- Ok(box_layouter.finish())
+/// An iterator over the translated text actions, created by [`translate_actions`].
+pub struct TranslatedActions<I> where I: Iterator<Item=TextAction> {
+ offset: Size2D,
+ iter: I,
+}
+
+impl<I> Iterator for TranslatedActions<I> where I: Iterator<Item=TextAction> {
+ type Item = TextAction;
+
+ fn next(&mut self) -> Option<TextAction> {
+ use TextAction::*;
+ self.iter.next().map(|action| match action {
+ MoveAbsolute(pos) => MoveAbsolute(pos + self.offset),
+ a => a,
+ })
+ }
}
/// The error type for layouting.