system/serenity
system/serenity
1
0
Fork 0
mirror of https://github.com/SerenityOS/serenity synced 2024-09-06 08:56:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

LibWeb: Allow IFC to size inline-flex boxes midway through flex layout

Browse source 
The part in FFC where we ask the parent formatting context to size the
flex container midway through layout is really weird, but let's at least
be consistently weird for BFC and IFC. Since IFC always works within its
parent BFC, it can simply forward these requests to the BFC.

This fixes an issue where inline-flex containers incorrectly had main
axis margins subtracted from their content size.
This commit is contained in:
Andreas Kling 2023-06-19 15:19:25 +02:00
parent 1737a0d1d9
commit e99a6fede4
4 changed files with 46 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
Tests/LibWeb/Layout/expected/flex/inline-flex-with-main-axis-margin-on-flex-container.txt Normal file
View file

@ -0,0 +1,10 @@
Viewport <#document> at (0,0) content-size 800x600 children: not-inline
BlockContainer <html> at (1,1) content-size 500x37.46875 [BFC] children: inline
line 0 width: 272.40625, height: 37.46875, bottom: 37.46875, baseline: 15.53125
frag 0 from Box start: 0, length: 0, rect: [10,10 162.40625x19.46875]
Box <body> at (10,10) content-size 162.40625x19.46875 flex-container(row) [FFC] children: not-inline
BlockContainer <div> at (11,11) content-size 160.40625x17.46875 flex-item [BFC] children: inline
line 0 width: 160.40625, height: 17.46875, bottom: 17.46875, baseline: 13.53125
frag 0 from TextNode start: 0, length: 20, rect: [11,11 160.40625x17.46875]
"Immobilie inserieren"
TextNode <#text>

17
Tests/LibWeb/Layout/input/flex/inline-flex-with-main-axis-margin-on-flex-container.html Normal file
View file

@ -0,0 +1,17 @@
<!DOCTYPE html><style>
* {
border: 1px solid black;
}
html {
background: white;
width: 500px;
}
body {
display: inline-flex;
margin-right: 100px;
background: pink;
}
div {
background: orange;
}
</style><body><div>Immobilie inserieren

15
Userland/Libraries/LibWeb/Layout/InlineFormattingContext.cpp
View file

@ -348,4 +348,19 @@ bool InlineFormattingContext::can_fit_new_line_at_y(CSSPixels y) const
return true;
}
bool InlineFormattingContext::can_determine_size_of_child() const
{
return parent().can_determine_size_of_child();
}
void InlineFormattingContext::determine_width_of_child(Box const& box, AvailableSpace const& available_space)
{
return parent().determine_width_of_child(box, available_space);
}
void InlineFormattingContext::determine_height_of_child(Box const& box, AvailableSpace const& available_space)
{
return parent().determine_height_of_child(box, available_space);
}
}

4
Userland/Libraries/LibWeb/Layout/InlineFormattingContext.h
View file

@ -34,6 +34,10 @@ public:
bool any_floats_intrude_at_y(CSSPixels y) const;
bool can_fit_new_line_at_y(CSSPixels y) const;
virtual bool can_determine_size_of_child() const override;
virtual void determine_width_of_child(Box const&, AvailableSpace const&) override;
virtual void determine_height_of_child(Box const&, AvailableSpace const&) override;
private:
void generate_line_boxes(LayoutMode);
void apply_justification_to_fragments(CSS::TextJustify, LineBox&, bool is_last_line);