beenull/ladybird
1
0
Fork 0
mirror of https://github.com/LadybirdBrowser/ladybird.git synced 2024-11-22 15:40:19 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

LibWeb: Propagate layout mode of table formatting context to table cells

Browse source
This commit is contained in:
Aliaksandr Kalenik 2023-01-14 15:11:58 +01:00 committed by Andreas Kling
parent 80578ead45
commit b44d977bf8
Notes: sideshowbarker 2024-07-17 03:18:29 +09:00 
Author: https://github.com/kalenikaliaksandr
Commit: https://github.com/SerenityOS/serenity/commit/b44d977bf8
Pull-request: https://github.com/SerenityOS/serenity/pull/17011
2 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
Userland/Libraries/LibWeb/Layout/TableFormattingContext.cpp
View file

@ -366,7 +366,7 @@ void TableFormattingContext::determine_intrisic_size_of_table_container(Availabl
}
}
void TableFormattingContext::calculate_row_heights()
void TableFormattingContext::calculate_row_heights(LayoutMode layout_mode)
{
for (auto& cell : m_cells) {
auto& cell_state = m_state.get_mutable(cell.box);
@ -395,10 +395,10 @@ void TableFormattingContext::calculate_row_heights()
cell_state.border_right = (should_hide_borders && is_right_most_cell) ? 0 : cell.box.computed_values().border_right().width;
cell_state.set_content_width((span_width - cell_state.border_box_left() - cell_state.border_box_right()));
auto independent_formatting_context = layout_inside(cell.box, LayoutMode::Normal, cell_state.available_inner_space_or_constraints_from(*m_available_space));
VERIFY(independent_formatting_context);
cell_state.set_content_height(independent_formatting_context->automatic_content_height());
independent_formatting_context->parent_context_did_dimension_child_root_box();
if (auto independent_formatting_context = layout_inside(cell.box, layout_mode, cell_state.available_inner_space_or_constraints_from(*m_available_space))) {
cell_state.set_content_height(independent_formatting_context->automatic_content_height());
independent_formatting_context->parent_context_did_dimension_child_root_box();
}
cell.baseline = box_baseline(m_state, cell.box);
@ -484,7 +484,7 @@ void TableFormattingContext::position_cell_boxes()
}
}
void TableFormattingContext::run(Box const& box, LayoutMode, AvailableSpace const& available_space)
void TableFormattingContext::run(Box const& box, LayoutMode layout_mode, AvailableSpace const& available_space)
{
m_available_space = available_space;
@ -507,7 +507,7 @@ void TableFormattingContext::run(Box const& box, LayoutMode, AvailableSpace cons
// Distribute the width of the table among columns.
distribute_width_to_columns();
calculate_row_heights();
calculate_row_heights(layout_mode);
position_row_boxes();
position_cell_boxes();

2
Userland/Libraries/LibWeb/Layout/TableFormattingContext.h
View file

@ -32,7 +32,7 @@ private:
void compute_table_width();
void distribute_width_to_columns();
void determine_intrisic_size_of_table_container(AvailableSpace const& available_space);
void calculate_row_heights();
void calculate_row_heights(LayoutMode layout_mode);
void position_row_boxes();
void position_cell_boxes();