RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-05-31 12:38:12 +00:00
Code Issues Activity Actions

LibWeb: Don't use the preferred increment as reference for distribution

Browse source 
The specification says we should distribute excess width proportionally
to the width of the cell, not to the preferred increment. Doing the
latter leads to distributing all excess width to just the cells which
demand some increment, even if it's very modest. Moreover, there's code
which partially implements the correct criteria just below the one we
remove here.
This commit is contained in:
Andi Gallo 2023-07-12 03:03:16 +00:00 • committed by Andreas Kling
parent 13687085dd
commit 030b1a197b
5 changed files with 93 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -532,10 +532,16 @@ void TableFormattingContext::distribute_width_to_columns()
expand_columns_to_fill_available_width(column_type);
};
// 1. The min-content sizing-guess is the set of column width assignments where each column is assigned its min-content width.
for (auto& column : m_columns) {
column.used_width = column.min_size;
}
// 2. The min-content-percentage sizing-guess is the set of column width assignments where:
// - each percent-column is assigned the larger of:
// - its intrinsic percentage width times the assignable width and
// - its min-content width.
// - all other columns are assigned their min-content width.
for (auto& column : m_columns) {
if (column.type == SizeType::Percent) {
column.used_width = max(column.min_size, column.percentage_width / 100 * available_width);
@ -547,6 +553,12 @@ void TableFormattingContext::distribute_width_to_columns()
return;
}
// 3. The min-content-specified sizing-guess is the set of column width assignments where:
// - each percent-column is assigned the larger of:
// - its intrinsic percentage width times the assignable width and
// - its min-content width
// - any other column that is constrained is assigned its max-content width
// - all other columns are assigned their min-content width.
for (auto& column : m_columns) {
if (column.type == SizeType::Pixel) {
column.used_width = column.max_size;
@ -558,20 +570,25 @@ void TableFormattingContext::distribute_width_to_columns()
return;
}
if (columns_total_used_width() < available_width) {
expand_columns_to_fill_available_width(SizeType::Auto);
// 4. The max-content sizing-guess is the set of column width assignments where:
// - each percent-column is assigned the larger of:
// - its intrinsic percentage width times the assignable width and
// - its min-content width
// - all other columns are assigned their max-content width.
for (auto& column : m_columns) {
if (column.type != SizeType::Percent) {
column.used_width = column.max_size;
}
}
if (columns_total_used_width() < available_width) {
expand_columns_to_fill_available_width(SizeType::Pixel);
}
// If the assignable table width is less than or equal to the max-content sizing-guess, the used widths of the columns must be the
// linear combination (with weights adding to 1) of the two consecutive sizing-guesses whose width sums bound the available width.
if (columns_total_used_width() < available_width) {
expand_columns_to_fill_available_width(SizeType::Percent);
}
// Otherwise, the used widths of the columns are the result of starting from the max-content sizing-guess and distributing
// the excess width to the columns of the table according to the rules for distributing excess width to columns (for used width).
// Implements steps 1 and 2 of https://www.w3.org/TR/css-tables-3/#distributing-width-to-columns
// FIXME: Implement steps 3-5 as well, which distribute excess width to constrained columns.
// FIXME: Implement steps 3-6 as well, which distribute excess width to constrained columns.
if (columns_total_used_width() < available_width) {
// NOTE: if all columns got their max width and there is still width to distribute left
// it should be assigned to columns proportionally to their max width