summaryrefslogtreecommitdiff
path: root/Userland/Libraries/LibWeb/Layout/LineBoxFragment.cpp
diff options
context:
space:
mode:
authorAndreas Kling <kling@serenityos.org>2022-03-24 22:45:51 +0100
committerAndreas Kling <kling@serenityos.org>2022-03-24 22:52:44 +0100
commit195ef5e26fc5c38b6a37ec8d0b28ee6fad142fab (patch)
treeae43a1ea3dbca607db7ba1c0c689c40420037635 /Userland/Libraries/LibWeb/Layout/LineBoxFragment.cpp
parent430559ea511f1167231fae7d4b2d34a45c20dccf (diff)
downloadserenity-195ef5e26fc5c38b6a37ec8d0b28ee6fad142fab.zip
LibWeb: Bring CSS line-height implementation closer to spec
We now distribute the line-height evenly between the space above and below inline-level boxes. This noticeably improves our baseline alignment in many cases. Note that the "vertical-align: <length>" case is quite awkward, as the extra height added by the offset baseline must count towards the line box height. There's a lot of room for improvement here, but this makes the buckets container on Acid3 show up in the right place, with the right size.
Diffstat (limited to 'Userland/Libraries/LibWeb/Layout/LineBoxFragment.cpp')
-rw-r--r--Userland/Libraries/LibWeb/Layout/LineBoxFragment.cpp45
1 files changed, 45 insertions, 0 deletions
diff --git a/Userland/Libraries/LibWeb/Layout/LineBoxFragment.cpp b/Userland/Libraries/LibWeb/Layout/LineBoxFragment.cpp
index 795c4dad41..fba9839902 100644
--- a/Userland/Libraries/LibWeb/Layout/LineBoxFragment.cpp
+++ b/Userland/Libraries/LibWeb/Layout/LineBoxFragment.cpp
@@ -139,4 +139,49 @@ Gfx::FloatRect LineBoxFragment::selection_rect(const Gfx::Font& font) const
return {};
}
+float LineBoxFragment::height_of_inline_level_box(FormattingState const& state) const
+{
+ auto height = [&] {
+ // From "10.8 Line height calculations: the 'line-height' and 'vertical-align' properties"
+ // https://www.w3.org/TR/CSS22/visudet.html#line-height
+
+ // For replaced elements, inline-block elements, and inline-table elements, this is the height of their margin box.
+ // FIXME: Support inline-table elements.
+ if (layout_node().is_replaced_box() || layout_node().is_inline_block()) {
+ auto const& fragment_box_state = state.get(static_cast<Box const&>(layout_node()));
+ return fragment_box_state.margin_box_height();
+ }
+ // For inline boxes, this is their 'line-height'.
+ return layout_node().line_height();
+ }();
+ if (auto length_percentage = layout_node().computed_values().vertical_align().get_pointer<CSS::LengthPercentage>(); length_percentage && length_percentage->is_length())
+ height += length_percentage->length().to_px(layout_node());
+ return height;
+}
+
+float LineBoxFragment::top_of_inline_level_box(FormattingState const& state) const
+{
+ // FIXME: Support inline-table elements.
+ if (layout_node().is_replaced_box() || layout_node().is_inline_block()) {
+ auto const& fragment_box_state = state.get(static_cast<Box const&>(layout_node()));
+ return m_offset.y() - fragment_box_state.margin_box_top();
+ }
+ return m_offset.y() - (layout_node().line_height() - layout_node().computed_values().font_size()) / 2;
+}
+
+float LineBoxFragment::bottom_of_inline_level_box(FormattingState const& state) const
+{
+ auto bottom = [&] {
+ // FIXME: Support inline-table elements.
+ if (layout_node().is_replaced_box() || layout_node().is_inline_block()) {
+ auto const& fragment_box_state = state.get(static_cast<Box const&>(layout_node()));
+ return m_offset.y() + fragment_box_state.content_height + fragment_box_state.margin_box_bottom();
+ }
+ return m_offset.y() + (layout_node().line_height() - layout_node().computed_values().font_size()) / 2;
+ }();
+ if (auto length_percentage = layout_node().computed_values().vertical_align().get_pointer<CSS::LengthPercentage>(); length_percentage && length_percentage->is_length())
+ bottom += length_percentage->length().to_px(layout_node());
+ return bottom;
+}
+
}