Home Verkennen Help
Registreren Inloggen
steve
/
ladybird
spiegel van https://github.com/LadybirdBrowser/ladybird
1
0
Vork 0
Bestanden Issues 0 Wiki
Bladeren bron

LibWeb: Only set line builder's block offset if clearance increases it

This prevents text from overlapping with each other if a `<br>` with
`clear: ..` is used in between.
Jelle Raaijmakers 5 dagen geleden
bovenliggende
6f1710121d
commit
04ba375cc7
3 gewijzigde bestanden met toevoegingen van 47 en 1 verwijderingen
Zij-aan-zij weergave Toon Diff Stats
  1. 2 1
      Libraries/LibWeb/Layout/InlineFormattingContext.cpp
  2. 24 0
      Tests/LibWeb/Layout/expected/block-and-inline/float-vertical-clearance-for-text-after-break.txt
  3. 21 0
      Tests/LibWeb/Layout/input/block-and-inline/float-vertical-clearance-for-text-after-break.html

+ 2 - 1
Libraries/LibWeb/Layout/InlineFormattingContext.cpp
Bestand weergeven 

@@ -283,7 +283,8 @@ void InlineFormattingContext::generate_line_boxes()
 
             if (item.node) {
 
                 auto introduce_clearance = parent().clear_floating_boxes(*item.node, *this);
 
                 if (introduce_clearance == BlockFormattingContext::DidIntroduceClearance::Yes) {
 
-                    line_builder.set_current_block_offset(vertical_float_clearance());
 
+                    if (vertical_float_clearance() > line_builder.current_block_offset())
 
+                        line_builder.set_current_block_offset(vertical_float_clearance());
 
                     parent().reset_margin_state();
 
                 }
 
             }

+ 24 - 0
Tests/LibWeb/Layout/expected/block-and-inline/float-vertical-clearance-for-text-after-break.txt
Bestand weergeven 

@@ -0,0 +1,24 @@
 
+Viewport <#document> at (0,0) content-size 800x600 children: not-inline
 
+  BlockContainer <html> at (0,0) content-size 800x100 [BFC] children: not-inline
 
+    BlockContainer <body> at (8,8) content-size 784x84 children: not-inline
 
+      BlockContainer <div.a> at (8,8) content-size 50x84 children: inline
 
+        frag 0 from TextNode start: 1, length: 3, rect: [8,58 27.15625x17] baseline: 13.296875
 
+            "foo"
 
+        frag 1 from TextNode start: 1, length: 3, rect: [8,75 27.640625x17] baseline: 13.296875
 
+            "bar"
 
+        TextNode <#text>
 
+        BlockContainer <div.b> at (8,8) content-size 50x50 floating [BFC] children: not-inline
 
+        TextNode <#text>
 
+        BreakNode <br.c>
 
+        TextNode <#text>
 
+      BlockContainer <(anonymous)> at (8,92) content-size 784x0 children: inline
 
+        TextNode <#text>
 
+
 
+ViewportPaintable (Viewport<#document>) [0,0 800x600]
 
+  PaintableWithLines (BlockContainer<HTML>) [0,0 800x100]
 
+    PaintableWithLines (BlockContainer<BODY>) [8,8 784x84]
 
+      PaintableWithLines (BlockContainer<DIV>.a) [8,8 50x84]
 
+        PaintableWithLines (BlockContainer<DIV>.b) [8,8 50x50]
 
+        TextPaintable (TextNode<#text>)
 
+        TextPaintable (TextNode<#text>)
 
+      PaintableWithLines (BlockContainer(anonymous)) [8,92 784x0]

+ 21 - 0
Tests/LibWeb/Layout/input/block-and-inline/float-vertical-clearance-for-text-after-break.html
Bestand weergeven 

@@ -0,0 +1,21 @@
 
+<!DOCTYPE html>
 
+<style>
 
+.a {
 
+    width: 50px;
 
+}
 
+.b {
 
+    background: red;
 
+    float: right;
 
+    height: 50px;
 
+    width: 50px;
 
+}
 
+.c {
 
+    clear: right;
 
+}
 
+</style>
 
+<div class="a">
 
+    <div class="b"></div>
 
+    foo
 
+    <br class="c">
 
+    bar
 
+</div>