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

LibWeb: Rewrite calculation of available space between floats

Browse source 
This code now works in terms of *intrusion* by left and right side
floats into a given box whose insides we're trying to layout.

Previously, it worked in terms of space occupied by floats in the root
box of the BFC they participated in. That created a bunch of edge cases
since the code asking about the information wasn't operating in root
coordinate space, but in the coordinate space of some arbitrarily nested
block descendant of the root.

This finally allows horizontal margins in the containing block chain to
affect floats and nested content correctly, and it also allows us to
remove a bogus workaround in InlineFormattingContext.
This commit is contained in:
Andreas Kling 2023-05-16 09:46:45 +02:00
parent 9bd4add734
commit bab6796099
8 changed files with 159 additions and 40 deletions
Download patch file Download diff file Expand all files Collapse all files

22
Tests/LibWeb/Layout/expected/block-and-inline/float-stress-1.txt
View file

@ -5,18 +5,18 @@ Viewport <#document> at (0,0) content-size 800x600 children: not-inline
TextNode <#text>
BlockContainer <div.outer> at (9,9) content-size 300x250 children: inline
line 0 width: 239.15625, height: 16, bottom: 16, baseline: 12.796875
frag 0 from TextNode start: 1, length: 24, rect: [61,9 212x16]
frag 0 from TextNode start: 1, length: 24, rect: [60,9 212x16]
"foo bar baz foo bar baz "
frag 1 from TextNode start: 1, length: 3, rect: [273,9 27.15625x16]
frag 1 from TextNode start: 1, length: 3, rect: [272,9 27.15625x16]
"foo"
line 1 width: 27.640625, height: 16, bottom: 32, baseline: 12.796875
frag 0 from TextNode start: 5, length: 3, rect: [263,25 27.640625x16]
frag 0 from TextNode start: 5, length: 3, rect: [262,25 27.640625x16]
"bar"
line 2 width: 27.203125, height: 16, bottom: 48, baseline: 12.796875
frag 0 from TextNode start: 9, length: 3, rect: [263,41 27.203125x16]
frag 0 from TextNode start: 9, length: 3, rect: [262,41 27.203125x16]
"baz"
line 3 width: 27.15625, height: 16, bottom: 64, baseline: 12.796875
frag 0 from TextNode start: 13, length: 3, rect: [263,57 27.15625x16]
frag 0 from TextNode start: 13, length: 3, rect: [262,57 27.15625x16]
"foo"
line 4 width: 0, height: 0, bottom: 0, baseline: 0
line 5 width: 98, height: 16, bottom: 84, baseline: 12.796875
@ -40,20 +40,20 @@ Viewport <#document> at (0,0) content-size 800x600 children: not-inline
frag 0 from TextNode start: 21, length: 31, rect: [9,157 274.359375x16]
"baz foo bar baz foo bar baz foo"
line 11 width: 239.640625, height: 16, bottom: 180, baseline: 12.796875
frag 0 from TextNode start: 53, length: 20, rect: [61,173 176.84375x16]
frag 0 from TextNode start: 53, length: 20, rect: [60,173 176.84375x16]
"bar baz foo bar baz "
frag 1 from TextNode start: 1, length: 7, rect: [238,173 62.796875x16]
frag 1 from TextNode start: 1, length: 7, rect: [237,173 62.796875x16]
"foo bar"
line 12 width: 204, height: 16, bottom: 196, baseline: 12.796875
frag 0 from TextNode start: 9, length: 16, rect: [61,189 141.203125x16]
frag 0 from TextNode start: 9, length: 16, rect: [60,189 141.203125x16]
"baz foo bar baz "
frag 1 from TextNode start: 1, length: 7, rect: [202,189 62.796875x16]
frag 1 from TextNode start: 1, length: 7, rect: [201,189 62.796875x16]
"foo bar"
line 13 width: 204, height: 16, bottom: 212, baseline: 12.796875
frag 0 from TextNode start: 9, length: 23, rect: [61,205 204x16]
frag 0 from TextNode start: 9, length: 23, rect: [60,205 204x16]
"baz foo bar baz foo bar"
line 14 width: 239.203125, height: 16, bottom: 228, baseline: 12.796875
frag 0 from TextNode start: 33, length: 27, rect: [61,221 239.203125x16]
frag 0 from TextNode start: 33, length: 27, rect: [60,221 239.203125x16]
"baz foo bar baz foo bar baz"
line 15 width: 274.796875, height: 16, bottom: 244, baseline: 12.796875
frag 0 from TextNode start: 61, length: 31, rect: [9,237 274.796875x16]