mirror of
https://github.com/RGBCube/serenity
synced 2025-07-25 14:07:46 +00:00
LibWeb: Stop inserting inline nodes into a generated wrapper box
493dd5d93c
caused the `::before`
pseudo-element node to be inserted before the element's content, which
caused issues with how we determine where to insert inline nodes into
the layout tree. At the time, I noticed the issue with contents of flex
containers, and prevented them from merging into a `::before` box.
However, a similar situation happens when we're not in a flex container,
but the pseudo-element has `display: block`. This commit fixes that
situation by using the same logic in both places, so a similar mistake
can't be made again.
This fixes the tab text being invisible on GitHub project pages. :^)
This commit is contained in:
parent
068f6771ad
commit
1132c858e9
3 changed files with 40 additions and 10 deletions
|
@ -66,24 +66,27 @@ static bool has_in_flow_block_children(Layout::Node const& layout_node)
|
|||
|
||||
static Layout::Node& insertion_parent_for_inline_node(Layout::NodeWithStyle& layout_parent)
|
||||
{
|
||||
auto last_child_creating_anonymous_wrapper_if_needed = [](auto& layout_parent) -> Layout::Node& {
|
||||
if (!layout_parent.last_child()
|
||||
|| !layout_parent.last_child()->is_anonymous()
|
||||
|| !layout_parent.last_child()->children_are_inline()
|
||||
|| layout_parent.last_child()->is_generated()) {
|
||||
layout_parent.append_child(layout_parent.create_anonymous_wrapper());
|
||||
}
|
||||
return *layout_parent.last_child();
|
||||
};
|
||||
|
||||
if (layout_parent.display().is_inline_outside() && layout_parent.display().is_flow_inside())
|
||||
return layout_parent;
|
||||
|
||||
if (layout_parent.display().is_flex_inside() || layout_parent.display().is_grid_inside()) {
|
||||
if (layout_parent.last_child() && layout_parent.last_child()->is_anonymous() && layout_parent.last_child()->children_are_inline() && !layout_parent.last_child()->is_generated())
|
||||
return *layout_parent.last_child();
|
||||
layout_parent.append_child(layout_parent.create_anonymous_wrapper());
|
||||
return *layout_parent.last_child();
|
||||
}
|
||||
if (layout_parent.display().is_flex_inside() || layout_parent.display().is_grid_inside())
|
||||
return last_child_creating_anonymous_wrapper_if_needed(layout_parent);
|
||||
|
||||
if (!has_in_flow_block_children(layout_parent) || layout_parent.children_are_inline())
|
||||
return layout_parent;
|
||||
|
||||
// Parent has block-level children, insert into an anonymous wrapper block (and create it first if needed)
|
||||
if (!layout_parent.last_child()->is_anonymous() || !layout_parent.last_child()->children_are_inline()) {
|
||||
layout_parent.append_child(layout_parent.create_anonymous_wrapper());
|
||||
}
|
||||
return *layout_parent.last_child();
|
||||
return last_child_creating_anonymous_wrapper_if_needed(layout_parent);
|
||||
}
|
||||
|
||||
static Layout::Node& insertion_parent_for_block_node(Layout::NodeWithStyle& layout_parent, Layout::Node& layout_node)
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue