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

LibWeb: Fix buttons with TextNode label

Browse source 
Fixes #20472.
This commit is contained in:
Andi Gallo 2023-08-11 03:19:31 +00:00 • committed by Andreas Kling
parent afb19a2cff
commit b34b80104f
9 changed files with 94 additions and 39 deletions
Download patch file Download diff file Expand all files Collapse all files

1
Userland/Libraries/LibWeb/Layout/Node.h
View file

@ -207,6 +207,7 @@ public:
Gfx::Font const& font() const { return *m_font; }
CSSPixels line_height() const { return m_line_height; }
void set_line_height(CSSPixels line_height) { m_line_height = line_height; }
Vector<CSS::BackgroundLayerData> const& background_layers() const { return computed_values().background_layers(); }
const CSS::AbstractImageStyleValue* list_style_image() const { return m_list_style_image; }

11
Userland/Libraries/LibWeb/Layout/TreeBuilder.cpp
View file

@ -387,6 +387,7 @@ ErrorOr<void> TreeBuilder::create_layout_tree(DOM::Node& dom_node, TreeBuilder::
auto cell_computed_values = CSS::ComputedValues();
static_cast<CSS::MutableComputedValues&>(cell_computed_values).set_display(CSS::Display { CSS::Display::Internal::TableCell });
static_cast<CSS::MutableComputedValues&>(cell_computed_values).set_vertical_align(CSS::VerticalAlign::Middle);
static_cast<CSS::MutableComputedValues&>(cell_computed_values).set_white_space(CSS::WhiteSpace::Nowrap);
auto flow_root_computed_values = CSS::ComputedValues();
static_cast<CSS::MutableComputedValues&>(flow_root_computed_values).set_width(CSS::Size::make_percentage(CSS::Percentage(100)));
@ -394,20 +395,20 @@ ErrorOr<void> TreeBuilder::create_layout_tree(DOM::Node& dom_node, TreeBuilder::
auto table_wrapper = parent.heap().template allocate_without_realm<BlockContainer>(parent.document(), nullptr, move(table_computed_values));
auto cell_wrapper = parent.heap().template allocate_without_realm<BlockContainer>(parent.document(), nullptr, move(cell_computed_values));
auto flow_root_wrapper = parent.heap().template allocate_without_realm<BlockContainer>(parent.document(), nullptr, move(flow_root_computed_values));
cell_wrapper->set_line_height(parent.line_height());
cell_wrapper->set_children_are_inline(parent.children_are_inline());
Vector<JS::Handle<Node>> sequence;
for (auto child = parent.first_child(); child; child = child->next_sibling()) {
if (!is_ignorable_whitespace(*child))
sequence.append(*child);
sequence.append(*child);
}
for (auto& node : sequence) {
parent.remove_child(*node);
flow_root_wrapper->append_child(*node);
cell_wrapper->append_child(*node);
}
cell_wrapper->append_child(*flow_root_wrapper);
table_wrapper->append_child(*cell_wrapper);
parent.append_child(*table_wrapper);
}