From 6cffabef03837b52a260508c676566a273c24c69 Mon Sep 17 00:00:00 2001 From: Andreas Kling Date: Thu, 24 Mar 2022 22:56:06 +0100 Subject: LibWeb: Support CSS vertical-align values "top" and "bottom" --- Userland/Libraries/LibWeb/Layout/LineBuilder.cpp | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-) (limited to 'Userland/Libraries/LibWeb') diff --git a/Userland/Libraries/LibWeb/Layout/LineBuilder.cpp b/Userland/Libraries/LibWeb/Layout/LineBuilder.cpp index b55e0b10d7..9f4e36350a 100644 --- a/Userland/Libraries/LibWeb/Layout/LineBuilder.cpp +++ b/Userland/Libraries/LibWeb/Layout/LineBuilder.cpp @@ -97,6 +97,19 @@ bool LineBuilder::should_break(LayoutMode layout_mode, float next_item_width, bo static float box_baseline(FormattingState const& state, Box const& box) { auto const& box_state = state.get(box); + + auto const& vertical_align = box.computed_values().vertical_align(); + if (vertical_align.has()) { + switch (vertical_align.get()) { + case CSS::VerticalAlign::Top: + return box_state.border_box_top(); + case CSS::VerticalAlign::Bottom: + return box_state.content_height + box_state.border_box_bottom(); + default: + break; + } + } + if (!box_state.line_boxes.is_empty()) return box_state.border_box_top() + box_state.offset.y() + box_state.line_boxes.last().baseline(); if (box.has_children() && !box.children_are_inline()) { @@ -178,13 +191,15 @@ void LineBuilder::update_last_line() auto y_value_for_alignment = [&](CSS::VerticalAlign vertical_align) { switch (vertical_align) { case CSS::VerticalAlign::Baseline: - case CSS::VerticalAlign::Bottom: + return m_current_y + line_box_baseline - fragment_baseline(fragment) + fragment.border_box_top(); + case CSS::VerticalAlign::Top: + return m_current_y + fragment.border_box_top(); case CSS::VerticalAlign::Middle: + case CSS::VerticalAlign::Bottom: case CSS::VerticalAlign::Sub: case CSS::VerticalAlign::Super: case CSS::VerticalAlign::TextBottom: case CSS::VerticalAlign::TextTop: - case CSS::VerticalAlign::Top: // FIXME: These are all 'baseline' return m_current_y + line_box_baseline - fragment_baseline(fragment) + fragment.border_box_top(); } -- cgit v1.2.3