RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-05-28 19:35:09 +00:00
Code Issues Activity Actions

LibWeb: Pass current target box to BFC::run()

Browse source 
The BFC "context box" is now the outer box of the block formatting
context. Previously the context box was always the current target box,
which made it hard to reason about who was really the containing block
of whom in various places.

Note that IFC still has the containing block as its context box, this
change only affects BFC. However, to clarify the situation in IFC,
I've added a containing_block() getter than returns the context_box().
This commit is contained in:
Andreas Kling 2020-12-06 19:48:02 +01:00
parent b638e74b68
commit 59de4adb60
14 changed files with 138 additions and 156 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -47,37 +47,37 @@ TableFormattingContext::~TableFormattingContext()
{
}
void TableFormattingContext::run(LayoutMode)
void TableFormattingContext::run(Box& box, LayoutMode)
{
compute_width(context_box());
compute_width(box);
float total_content_height = 0;
context_box().for_each_child_of_type<TableRowGroupBox>([&](auto& box) {
compute_width(box);
auto column_count = box.column_count();
box.for_each_child_of_type<TableRowGroupBox>([&](auto& row_group_box) {
compute_width(row_group_box);
auto column_count = row_group_box.column_count();
Vector<float> column_widths;
column_widths.resize(column_count);
box.template for_each_child_of_type<TableRowBox>([&](auto& row) {
row_group_box.template for_each_child_of_type<TableRowBox>([&](auto& row) {
calculate_column_widths(row, column_widths);
});
float content_height = 0;
box.template for_each_child_of_type<TableRowBox>([&](auto& row) {
row_group_box.template for_each_child_of_type<TableRowBox>([&](auto& row) {
row.set_offset(0, content_height);
layout_row(row, column_widths);
content_height += row.height();
});
box.set_height(content_height);
row_group_box.set_height(content_height);
total_content_height += content_height;
});
// FIXME: This is a total hack, we should respect the 'height' property.
context_box().set_height(total_content_height);
box.set_height(total_content_height);
}
void TableFormattingContext::calculate_column_widths(Box& row, Vector<float>& column_widths)