RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-26 00:37:35 +00:00
Code Issues Activity Actions

LibWeb: Move cells positioning in separate function in TFC

Browse source
This commit is contained in:
Aliaksandr Kalenik 2023-01-08 00:57:57 +03:00 • committed by Andreas Kling
parent ea4937a457
commit 0e1da540b6
2 changed files with 30 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -446,38 +446,14 @@ void TableFormattingContext::position_row_boxes()
}); });
} }
void TableFormattingContext::run(Box const& box, LayoutMode, AvailableSpace const& available_space) void TableFormattingContext::position_cell_boxes()
{ {
m_available_space = available_space;
CSSPixels total_content_height = 0;
// Determine the number of rows/columns the table requires.
calculate_row_column_grid(box);
// Compute the minimum width of each column.
compute_table_measures();
if (available_space.width.is_intrinsic_sizing_constraint()) {
determine_intrisic_size_of_table_container(available_space);
return;
}
// Compute the width of the table.
compute_table_width();
// Distribute the width of the table among columns.
distribute_width_to_columns();
CSSPixels left_column_offset = 0; CSSPixels left_column_offset = 0;
for (auto& column : m_columns) { for (auto& column : m_columns) {
column.left_offset = left_column_offset; column.left_offset = left_column_offset;
left_column_offset += column.used_width; left_column_offset += column.used_width;
} }
calculate_row_heights();
position_row_boxes();
for (auto& cell : m_cells) { for (auto& cell : m_cells) {
auto& cell_state = m_state.get_mutable(cell.box); auto& cell_state = m_state.get_mutable(cell.box);
auto& row_state = m_state.get(m_rows[cell.row_index].box); auto& row_state = m_state.get(m_rows[cell.row_index].box);
@ -506,6 +482,34 @@ void TableFormattingContext::run(Box const& box, LayoutMode, AvailableSpace cons
cell_state.offset = row_state.offset.translated(cell_state.border_box_left() + m_columns[cell.column_index].left_offset, cell_state.border_box_top()); cell_state.offset = row_state.offset.translated(cell_state.border_box_left() + m_columns[cell.column_index].left_offset, cell_state.border_box_top());
} }
}
void TableFormattingContext::run(Box const& box, LayoutMode, AvailableSpace const& available_space)
{
m_available_space = available_space;
CSSPixels total_content_height = 0;
// Determine the number of rows/columns the table requires.
calculate_row_column_grid(box);
// Compute the minimum width of each column.
compute_table_measures();
if (available_space.width.is_intrinsic_sizing_constraint()) {
determine_intrisic_size_of_table_container(available_space);
return;
}
// Compute the width of the table.
compute_table_width();
// Distribute the width of the table among columns.
distribute_width_to_columns();
calculate_row_heights();
position_row_boxes();
position_cell_boxes();
m_state.get_mutable(context_box()).set_content_height(total_content_height); m_state.get_mutable(context_box()).set_content_height(total_content_height);

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

@ -27,6 +27,7 @@ private:
void determine_intrisic_size_of_table_container(AvailableSpace const& available_space); void determine_intrisic_size_of_table_container(AvailableSpace const& available_space);
void calculate_row_heights(); void calculate_row_heights();
void position_row_boxes(); void position_row_boxes();
void position_cell_boxes();
CSSPixels m_automatic_content_height { 0 }; CSSPixels m_automatic_content_height { 0 };