Use CSS definition of line height #84
Conversation
|
I'll take a look at this again after we get |
nicoburns
force-pushed
the
css-line-height
branch
from
faa7ddf
to
17cc0bd
Compare
|
I've rebased this to be directly on top of I don't see how we'd do this outside of this layer as it controls the spacing between lines (a key part of layout!). And without this change parley doesn't let the user control that as it computes it from the font metrics (in a slightly different way to this - letting ascent + descent + leading control the line height, rather than letting line_height - (ascent + descent) control the leading). |
|
I took a look and I think it's fine the way it is, except the comment on the |
nicoburns
force-pushed
the
css-line-height
branch
from
17cc0bd
to
06f872c
Compare
Let line-height be line_height * font_size with no regard for font metrics. Font metrics are still used to determine the baseline with the line box.
nicoburns
force-pushed
the
css-line-height
branch
from
06f872c
to
a5b7214
Compare
- Builds on top of #84 which should be merged first to preserve history ## Changes made - ### Entire unresolved style struct - Adds an "unresolved style struct" (`TextStyle`) to `style/mod.rs` - The new `TreeBuilder` allows you to directly pass an entire style struct (rather than just "changed styles" relative to a previous node in the tree) as this is easier for integrating with Stylo which already resolves inherited styles. So I have added an "unresolved" version of the style struct to allow this API to still plug into the other parts of Parley's style resolution functionality. - Adds a corresponding`resolve_entire_style_set` method to `LayoutContext` to convert `TextStyle` into `ResolvedStyle`. - ### Moved code - Moves the `RangedBuilder` from `context.rs` to a new `builder.rs` module (as there are now two builders, justifying a separate module). - Extract most of `RangedBuilder::build_into` into a standalone `build_into_layout` function (`builder.rs`) that can be shared between the ranged and tree builders. - Moves the `RangedStyle` and `RangedProperty` types from `resolve/range.rs` to `resolve/mod.rs`. These types are shared between the `RangedBuilder` and the `TreeBuilder`. - ### Tree builder - Adds a `TreeBuilder` (also to `builder.rs`). This mostly delegates to `TreeStyleBuilder` - Add a `TreeStyleBuilder` (`resolve/tree.rs`). This is the vast majority of the new code - The `TreeStyleBuilder` implements HTML-style whitespace collapsing (opt-in). This probably ought to become a style rather than being a flag on the style builder. - Updated swash example to optionally use the tree builder (depending on command line opt)
Implements CSS style line height computation.
This is now directly on top of main and #76 builds on top of this.