summaryrefslogtreecommitdiff
path: root/Userland/Libraries
diff options
context:
space:
mode:
authorAliaksandr Kalenik <kalenik.aliaksandr@gmail.com>2023-01-07 01:19:52 +0300
committerLinus Groh <mail@linusgroh.de>2023-01-07 14:59:56 +0100
commita913410730a8515886da3e28b4162447e0eca632 (patch)
tree9205b0275e2d8cb20c01fc14ce0440489f0a263d /Userland/Libraries
parent64a242261e0aa3bb853453e2d1c472ce8f558cda (diff)
downloadserenity-a913410730a8515886da3e28b4162447e0eca632.zip
LibWeb: Consider span in table column width calculation
Implemention of following parts in CSS Tables 3 spec: https://www.w3.org/TR/css-tables-3/#min-content-width-of-a-column-based-on-cells-of-span-up-to-n-n--1 https://www.w3.org/TR/css-tables-3/#max-content-width-of-a-column-based-on-cells-of-span-up-to-n-n--1
Diffstat (limited to 'Userland/Libraries')
-rw-r--r--Userland/Libraries/LibWeb/Layout/TableFormattingContext.cpp68
-rw-r--r--Userland/Libraries/LibWeb/Layout/TableFormattingContext.h2
2 files changed, 66 insertions, 4 deletions
diff --git a/Userland/Libraries/LibWeb/Layout/TableFormattingContext.cpp b/Userland/Libraries/LibWeb/Layout/TableFormattingContext.cpp
index 96368c440c..bf6b7ad044 100644
--- a/Userland/Libraries/LibWeb/Layout/TableFormattingContext.cpp
+++ b/Userland/Libraries/LibWeb/Layout/TableFormattingContext.cpp
@@ -103,6 +103,8 @@ void TableFormattingContext::calculate_row_column_grid(Box const& box)
void TableFormattingContext::compute_table_measures()
{
+ size_t max_cell_column_span = 1;
+
for (auto& cell : m_cells) {
auto width_of_containing_block = m_available_space->width.to_px();
auto width_of_containing_block_as_length = CSS::Length::make_px(width_of_containing_block);
@@ -137,10 +139,68 @@ void TableFormattingContext::compute_table_measures()
m_columns[cell.column_index].type = ColumnType::Pixel;
}
- auto cell_outer_min_content_width = min_width + cell_intrinsic_offsets;
- auto cell_outer_max_content_width = max(max(width, min_width), max_width) + cell_intrinsic_offsets;
- m_columns[cell.column_index].min_width = max(m_columns[cell.column_index].min_width, cell_outer_min_content_width);
- m_columns[cell.column_index].max_width = max(m_columns[cell.column_index].max_width, cell_outer_max_content_width);
+ cell.min_width = min_width + cell_intrinsic_offsets;
+ cell.max_width = max(max(width, min_width), max_width) + cell_intrinsic_offsets;
+
+ max_cell_column_span = max(max_cell_column_span, cell.column_span);
+ }
+
+ for (auto& cell : m_cells) {
+ if (cell.column_span == 1) {
+ m_columns[cell.column_index].min_width = max(m_columns[cell.column_index].min_width, cell.min_width);
+ m_columns[cell.column_index].max_width = max(m_columns[cell.column_index].max_width, cell.max_width);
+ }
+ }
+
+ for (size_t current_column_span = 2; current_column_span < max_cell_column_span; current_column_span++) {
+ // https://www.w3.org/TR/css-tables-3/#min-content-width-of-a-column-based-on-cells-of-span-up-to-n-n--1
+ Vector<Vector<CSSPixels>> cell_min_contributions_by_column_index;
+ cell_min_contributions_by_column_index.resize(m_columns.size());
+ // https://www.w3.org/TR/css-tables-3/#max-content-width-of-a-column-based-on-cells-of-span-up-to-n-n--1
+ Vector<Vector<CSSPixels>> cell_max_contributions_by_column_index;
+ cell_max_contributions_by_column_index.resize(m_columns.size());
+ for (auto& cell : m_cells) {
+ if (cell.column_span == current_column_span) {
+ // Define the baseline max-content width as the sum of the max-content widths based on cells of span up to N-1 of all columns that the cell spans.
+ CSSPixels baseline_max_content_width = 0;
+ auto cell_start_column_index = cell.column_index;
+ auto cell_end_column_index = cell.column_index + cell.column_span;
+ for (auto column_index = cell_start_column_index; column_index < cell_end_column_index; column_index++) {
+ baseline_max_content_width += m_columns[column_index].max_width;
+ }
+
+ // The contribution of the cell is the sum of:
+ // the min-content width of the column based on cells of span up to N-1
+ auto cell_min_contribution = m_columns[cell.column_index].min_width;
+ // and the product of:
+ // - the ratio of the max-content width based on cells of span up to N-1 of the column to the baseline max-content width
+ // - the outer min-content width of the cell minus the baseline max-content width and baseline border spacing, or 0 if this is negative
+ cell_min_contribution += (m_columns[cell.column_index].max_width / baseline_max_content_width) * max(CSSPixels(0), cell.min_width - baseline_max_content_width);
+
+ // The contribution of the cell is the sum of:
+ // the max-content width of the column based on cells of span up to N-1
+ auto cell_max_contribution = m_columns[cell.column_index].max_width;
+ // and the product of:
+ // - the ratio of the max-content width based on cells of span up to N-1 of the column to the baseline max-content width
+ // - the outer max-content width of the cell minus the baseline max-content width and the baseline border spacing, or 0 if this is negative
+ cell_max_contribution += (m_columns[cell.column_index].max_width / baseline_max_content_width) * max(CSSPixels(0), cell.max_width - baseline_max_content_width);
+
+ cell_min_contributions_by_column_index[cell.column_index].append(cell_min_contribution);
+ cell_max_contributions_by_column_index[cell.column_index].append(cell_max_contribution);
+ }
+ }
+
+ for (size_t column_index = 0; column_index < m_columns.size(); column_index++) {
+ // min-content width of a column based on cells of span up to N (N > 1) is
+ // the largest of the min-content width of the column based on cells of span up to N-1 and the contributions of the cells in the column whose colSpan is N
+ for (auto min_contribution : cell_min_contributions_by_column_index[column_index])
+ m_columns[column_index].min_width = max(m_columns[column_index].min_width, min_contribution);
+
+ // max-content width of a column based on cells of span up to N (N > 1) is
+ // the largest of the max-content width based on cells of span up to N-1 and the contributions of the cells in the column whose colSpan is N
+ for (auto max_contribution : cell_max_contributions_by_column_index[column_index])
+ m_columns[column_index].max_width = max(m_columns[column_index].max_width, max_contribution);
+ }
}
}
diff --git a/Userland/Libraries/LibWeb/Layout/TableFormattingContext.h b/Userland/Libraries/LibWeb/Layout/TableFormattingContext.h
index 8f63e677cd..ea7339e740 100644
--- a/Userland/Libraries/LibWeb/Layout/TableFormattingContext.h
+++ b/Userland/Libraries/LibWeb/Layout/TableFormattingContext.h
@@ -58,6 +58,8 @@ private:
size_t column_span;
size_t row_span;
CSSPixels baseline { 0 };
+ CSSPixels min_width { 0 };
+ CSSPixels max_width { 0 };
};
Vector<Cell> m_cells;