RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-26 08:47:34 +00:00
Code Issues Activity Actions

LibWeb: Consider colgroups while calculating table grid size

Browse source 
We should take in account <col> elements in column groups while finding
number of columns in a table.
This commit is contained in:
Aliaksandr Kalenik 2023-11-04 04:08:59 +01:00 • committed by Andreas Kling
parent 6d31d81309
commit 2660bbb94f
4 changed files with 35 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

16
Tests/LibWeb/Layout/expected/table/colgroup-with-two-cols.txt Normal file
View file

@ -0,0 +1,16 @@
Viewport <#document> at (0,0) content-size 800x600 children: not-inline
BlockContainer <html> at (0,0) content-size 800x600 [BFC] children: not-inline
BlockContainer <body> at (8,8) content-size 784x2 children: not-inline
TableWrapper <(anonymous)> at (8,8) content-size 6x2 [BFC] children: not-inline
Box <table> at (8,8) content-size 6x2 table-box [TFC] children: not-inline
BlockContainer <colgroup#my-group> (not painted) table-column-group children: not-inline
BlockContainer <col> (not painted) children: not-inline
BlockContainer <col> (not painted) children: not-inline
Box <tbody> at (8,8) content-size 0x0 table-row-group children: not-inline
ViewportPaintable (Viewport<#document>) [0,0 800x600]
PaintableWithLines (BlockContainer<HTML>) [0,0 800x600]
PaintableWithLines (BlockContainer<BODY>) [8,8 784x2]
PaintableWithLines (TableWrapper(anonymous)) [8,8 6x2]
PaintableBox (Box<TABLE>) [8,8 6x2]
PaintableBox (Box<TBODY>) [8,8 0x0]

1
Tests/LibWeb/Layout/input/table/colgroup-with-two-cols.html Normal file
View file

@ -0,0 +1 @@
<table><colgroup id="my-group"><col width="40"><col></colgroup><tbody></tbody></table>

13
Userland/Libraries/LibWeb/Layout/TableGrid.cpp
View file

@ -5,6 +5,7 @@
*/ */
#include <LibWeb/HTML/HTMLTableCellElement.h> #include <LibWeb/HTML/HTMLTableCellElement.h>
#include <LibWeb/HTML/HTMLTableColElement.h>
#include <LibWeb/Layout/TableGrid.h> #include <LibWeb/Layout/TableGrid.h>
namespace Web::Layout { namespace Web::Layout {
@ -62,6 +63,18 @@ TableGrid TableGrid::calculate_row_column_grid(Box const& box, Vector<Cell>& cel
y_current++; y_current++;
}; };
auto process_col_group = [&](auto& col_group) {
auto dom_node = col_group.dom_node();
dom_node->template for_each_in_subtree_of_type<HTML::HTMLTableColElement>([&](auto&) {
x_width += 1;
return IterationDecision::Continue;
});
};
for_each_child_box_matching(box, is_table_column_group, [&](auto& column_group_box) {
process_col_group(column_group_box);
});
for_each_child_box_matching(box, is_table_row_group, [&](auto& row_group_box) { for_each_child_box_matching(box, is_table_row_group, [&](auto& row_group_box) {
for_each_child_box_matching(row_group_box, is_table_row, [&](auto& row_box) { for_each_child_box_matching(row_group_box, is_table_row, [&](auto& row_box) {
process_row(row_box); process_row(row_box);

5
Userland/Libraries/LibWeb/Layout/TableGrid.h
View file

@ -65,6 +65,11 @@ public:
return box.display().is_table_row(); return box.display().is_table_row();
} }
static bool is_table_column_group(Box const& box)
{
return box.display().is_table_column_group();
}
template<typename Matcher, typename Callback> template<typename Matcher, typename Callback>
static void for_each_child_box_matching(Box const& parent, Matcher matcher, Callback callback) static void for_each_child_box_matching(Box const& parent, Matcher matcher, Callback callback)
{ {