beenull/ladybird
1
0
Fork 0
mirror of https://github.com/LadybirdBrowser/ladybird.git synced 2024-11-22 23:50:19 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

LibWeb: Collapse margin-left with space used by left-side floats

Browse source 
We had an issue where boxes with margin-left were shifted right by
left-side floats twice instead of just once.
This commit is contained in:
Andreas Kling 2023-03-10 22:06:20 +01:00
parent 1cf5737e9e
commit f97754942c
Notes: sideshowbarker 2024-07-17 07:11:12 +09:00 
Author: https://github.com/awesomekling
Commit: https://github.com/SerenityOS/serenity/commit/f97754942c
3 changed files with 29 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
Tests/LibWeb/Layout/expected/ifc-float-left-and-sibling-with-margin-left.txt Normal file
View file

@ -0,0 +1,9 @@
Viewport <#document> at (0,0) content-size 800x600 children: not-inline
BlockContainer <html> at (1,1) content-size 798x61 children: not-inline
BlockContainer <body> at (10,10) content-size 780x19.46875 children: not-inline
BlockContainer <div.thumbnail> at (11,11) content-size 50x50 floating children: not-inline
BlockContainer <div.title> at (91,11) content-size 698x17.46875 children: inline
line 0 width: 125.125, height: 17.46875, bottom: 17.46875, baseline: 13.53125
frag 0 from TextNode start: 0, length: 14, rect: [91,11 125.125x17.46875]
"Chrono Trigger"
TextNode <#text>

16
Tests/LibWeb/Layout/input/ifc-float-left-and-sibling-with-margin-left.html Normal file
View file

@ -0,0 +1,16 @@
<!DOCTYPE html><html><head><style>
* {
border: 1px solid black;
font-family: 'SerenitySans';
}
.thumbnail {
float: left;
width: 50px;
height: 50px;
background-color: pink;
}
.title {
margin-left: 80px;
background-color: orange;
}
</style></head><body><div class="thumbnail"></div><div class="title">Chrono Trigger

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

@ -158,6 +158,10 @@ void LineBuilder::update_last_line()
CSSPixels x_offset_bottom = m_context.leftmost_x_offset_at(m_current_y + current_line_height - 1);
CSSPixels x_offset = max(x_offset_top, x_offset_bottom);
// If the IFC's containing block has left-side margin, it has already been shifted to the right by that amount.
// We subtract the margin-left here to ensure that the left-side "space used by floats" doesn't get applied twice.
x_offset = max(CSSPixels(0), x_offset - m_containing_block_state.margin_left);
CSSPixels excess_horizontal_space = m_available_width_for_current_line - line_box.width();
switch (text_align) {