RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-05-20 18:15:07 +00:00
Code Issues Activity Actions

LibWeb: More work on table layout

Browse source 
Table row layout is now split into two phases:

1. Compute all the column widths (even taking colspan into account!)
2. Place all cells at the correct x,y offsets based on column widths.

Both phases visit all rows and all cells.
This commit is contained in:
Andreas Kling 2020-06-13 00:12:23 +02:00
parent 365703e3f3
commit 62893a54cc
4 changed files with 53 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

28
Libraries/LibWeb/Layout/LayoutTableRowGroup.cpp
View file

@ -25,8 +25,9 @@
*/
#include <LibWeb/DOM/Element.h>
#include <LibWeb/Layout/LayoutTableRowGroup.h>
#include <LibWeb/Layout/LayoutTableCell.h>
#include <LibWeb/Layout/LayoutTableRow.h>
#include <LibWeb/Layout/LayoutTableRowGroup.h>
namespace Web {
@ -39,18 +40,39 @@ LayoutTableRowGroup::~LayoutTableRowGroup()
{
}
void LayoutTableRowGroup::layout(LayoutMode layout_mode)
size_t LayoutTableRowGroup::column_count() const
{
size_t table_column_count = 0;
for_each_child_of_type<LayoutTableRow>([&](auto& row) {
size_t row_column_count = 0;
row.template for_each_child_of_type<LayoutTableCell>([&](auto& cell) {
row_column_count += cell.colspan();
});
table_column_count = max(table_column_count, row_column_count);
});
return table_column_count;
}
void LayoutTableRowGroup::layout(LayoutMode)
{
compute_width();
if (!is_inline())
compute_position();
auto column_count = this->column_count();
Vector<float> column_widths;
column_widths.resize(column_count);
for_each_child_of_type<LayoutTableRow>([&](auto& row) {
row.calculate_column_widths(column_widths);
});
float content_height = 0;
for_each_child_of_type<LayoutTableRow>([&](auto& row) {
row.set_offset(0, content_height);
row.layout(layout_mode);
row.layout_row(column_widths);
content_height += row.height();
});