mirrors/ladybird
0
0
Fork 0
mirror of https://github.com/LadybirdBrowser/ladybird.git synced 2025-09-29 04:39:10 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 10

LibWeb/Layout: Account for box-sizing in table width/height calculations

Browse source 
Fixes #1726

Fixes
wpt/css/CSS2/abspos/abspos-containing-block-initial-004c.xht
wpt/css/CSS2/abspos/abspos-containing-block-initial-004d.xht
wpt/css/CSS2/abspos/abspos-containing-block-initial-005b.xht
wpt/css/CSS2/abspos/abspos-containing-block-initial-005d.xht
This commit is contained in:
stasoid 2024-11-25 20:42:19 +05:00 • committed by Alexander Kalenik
commit a90b7026fb
Notes: github-actions[bot] 2024-11-29 14:44:53 +00:00
5 changed files with 57 additions and 39 deletions
Download patch file Download diff file Expand all files Collapse all files

13
Libraries/LibWeb/Layout/TableFormattingContext.cpp
View file

@ -516,8 +516,10 @@ void TableFormattingContext::compute_table_width()
// resolved-table-width) other than auto, the used width is the greater
// of resolved-table-width, and the used min-width of the table.
CSSPixels resolved_table_width = computed_values.width().to_px(table_box(), width_of_table_wrapper_containing_block);
// Since used_width is content width, we need to subtract the border spacing from the specified width for a consistent comparison.
used_width = max(resolved_table_width - table_box_state.border_box_left() - table_box_state.border_box_right(), used_min_width);
// Since used_width is content width, we need to subtract the border and padding spacing from the specified width for a consistent comparison.
if (computed_values.box_sizing() == CSS::BoxSizing::BorderBox)
resolved_table_width -= table_box_state.border_box_left() + table_box_state.border_box_right();
used_width = max(resolved_table_width, used_min_width);
if (!should_treat_max_width_as_none(table_box(), m_available_space->width))
used_width = min(used_width, computed_values.max_width().to_px(table_box(), width_of_table_wrapper_containing_block));
}
@ -912,8 +914,11 @@ void TableFormattingContext::compute_table_height()
// ends up smaller than this number.
CSSPixels height_of_table_containing_block = m_state.get(*table_wrapper().containing_block()).content_height();
auto specified_table_height = table_box().computed_values().height().to_px(table_box(), height_of_table_containing_block);
auto const& table_state = m_state.get(table_box());
m_table_height = max(m_table_height, specified_table_height - table_state.border_box_top() - table_state.border_box_bottom());
if (table_box().computed_values().box_sizing() == CSS::BoxSizing::BorderBox) {
auto const& table_state = m_state.get(table_box());
specified_table_height -= table_state.border_box_top() + table_state.border_box_bottom();
}
m_table_height = max(m_table_height, specified_table_height);
}
for (auto& row : m_rows) {