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

LibWeb: Make flex containers be Layout::Box

Browse source 
Flex containers were incorrectly represented as BlockContainer before,
which would make some CSS layout algorithms do the wrong thing.
This commit is contained in:
Andreas Kling 2023-01-23 15:03:45 +01:00
parent 51555dea7c
commit 44cf418975
2 changed files with 8 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

7
Userland/Libraries/LibWeb/DOM/Element.cpp
View file

@ -315,12 +315,15 @@ JS::GCPtr<Layout::Node> Element::create_layout_node_for_display_type(DOM::Docume
if (display.is_flow_inside()) if (display.is_flow_inside())
return document.heap().allocate_without_realm<Layout::InlineNode>(document, element, move(style)); return document.heap().allocate_without_realm<Layout::InlineNode>(document, element, move(style));
if (display.is_flex_inside()) if (display.is_flex_inside())
return document.heap().allocate_without_realm<Layout::BlockContainer>(document, element, move(style)); return document.heap().allocate_without_realm<Layout::Box>(document, element, move(style));
dbgln_if(LIBWEB_CSS_DEBUG, "FIXME: Support display: {}", display.to_deprecated_string()); dbgln_if(LIBWEB_CSS_DEBUG, "FIXME: Support display: {}", display.to_deprecated_string());
return document.heap().allocate_without_realm<Layout::InlineNode>(document, element, move(style)); return document.heap().allocate_without_realm<Layout::InlineNode>(document, element, move(style));
} }
if (display.is_flow_inside() || display.is_flow_root_inside() || display.is_flex_inside() || display.is_grid_inside()) if (display.is_flex_inside())
return document.heap().allocate_without_realm<Layout::Box>(document, element, move(style));
if (display.is_flow_inside() || display.is_flow_root_inside() || display.is_grid_inside())
return document.heap().allocate_without_realm<Layout::BlockContainer>(document, element, move(style)); return document.heap().allocate_without_realm<Layout::BlockContainer>(document, element, move(style));
TODO(); TODO();

4
Userland/Libraries/LibWeb/Layout/Node.cpp
View file

@ -65,9 +65,11 @@ bool Node::can_contain_boxes_with_position_absolute() const
static Box const* nearest_ancestor_capable_of_forming_a_containing_block(Node const& node) static Box const* nearest_ancestor_capable_of_forming_a_containing_block(Node const& node)
{ {
for (auto const* ancestor = node.parent(); ancestor; ancestor = ancestor->parent()) { for (auto const* ancestor = node.parent(); ancestor; ancestor = ancestor->parent()) {
if (ancestor->is_block_container()) if (ancestor->is_block_container()
|| ancestor->display().is_flex_inside()) {
return verify_cast<Box>(ancestor); return verify_cast<Box>(ancestor);
} }
}
return nullptr; return nullptr;
} }