We use cookies to ensure you get the best experience on our website
首页 发现 帮助
注册 登录
0ct0pu5
/
ladybird
1
0
派生 0
文件 工单管理 0 合并请求 0 Wiki
浏览代码

LibWeb: Propagate font-size & line-height into generated table boxes

The final used values for these properties is stored in the layout node,
so we need to make sure they are propagated there as well when doing
table box fixup.
Andreas Kling 1 年之前
父节点
8eb10b135d
当前提交
589a1e9325
共有 3 个文件被更改，包括 34 次插入 和 1 次删除
合并视图 显示文件统计
  1. 20 0
      Tests/LibWeb/Layout/expected/table/table-fixup-font-size-and-line-height.txt
  2. 8 0
      Tests/LibWeb/Layout/input/table/table-fixup-font-size-and-line-height.html
  3. 6 1
      Userland/Libraries/LibWeb/Layout/TreeBuilder.cpp

+ 20 - 0
Tests/LibWeb/Layout/expected/table/table-fixup-font-size-and-line-height.txt
查看文件 

@@ -0,0 +1,20 @@
 
+Viewport <#document> at (0,0) content-size 800x600 children: not-inline
 
+  BlockContainer <html> at (0,0) content-size 800x116 [BFC] children: not-inline
 
+    BlockContainer <body> at (8,8) content-size 784x100 children: not-inline
 
+      TableWrapper <(anonymous)> at (8,8) content-size 69.078125x100 [BFC] children: not-inline
 
+        Box <div> at (8,8) content-size 69.078125x100 table-box [TFC] children: inline
 
+          Box <(anonymous)> at (8,8) content-size 69.078125x100 table-row children: inline
 
+            BlockContainer <(anonymous)> at (8,8) content-size 69.078125x100 table-cell [BFC] children: inline
 
+              line 0 width: 69.078125, height: 100, bottom: 100, baseline: 59
 
+                frag 0 from TextNode start: 0, length: 5, rect: [8,8 69.078125x100]
 
+                  "hello"
 
+              TextNode <#text>
 
+
 
+ViewportPaintable (Viewport<#document>) [0,0 800x600]
 
+  PaintableWithLines (BlockContainer<HTML>) [0,0 800x116]
 
+    PaintableWithLines (BlockContainer<BODY>) [8,8 784x100]
 
+      PaintableWithLines (TableWrapper(anonymous)) [8,8 69.078125x100]
 
+        PaintableBox (Box<DIV>) [8,8 69.078125x100]
 
+          PaintableBox (Box(anonymous)) [8,8 69.078125x100]
 
+            PaintableWithLines (BlockContainer(anonymous)) [8,8 69.078125x100]
 
+              TextPaintable (TextNode<#text>)

+ 8 - 0
Tests/LibWeb/Layout/input/table/table-fixup-font-size-and-line-height.html
查看文件 

@@ -0,0 +1,8 @@
 
+<!doctype html><style>
 
+* { outline: 1px solid black; }
 
+div { display: table; }
 
+body {
 
+    font-size: 30px;
 
+    line-height: 100px;
 
+}
 
+</style><body><div>hello

+ 6 - 1
Userland/Libraries/LibWeb/Layout/TreeBuilder.cpp
查看文件 

@@ -585,6 +585,7 @@ static void wrap_in_anonymous(Vector<JS::Handle<Node>>& sequence, Node* nearest_
 
     }
 
     }
 
     wrapper->set_children_are_inline(parent.children_are_inline());
 
     wrapper->set_children_are_inline(parent.children_are_inline());
 
     wrapper->set_line_height(parent.line_height());
 
     wrapper->set_line_height(parent.line_height());
 
+    wrapper->set_font(parent.font());
 
     if (nearest_sibling)
 
     if (nearest_sibling)
 
         parent.insert_before(*wrapper, *nearest_sibling);
 
         parent.insert_before(*wrapper, *nearest_sibling);
 
     else
 
     else
 
@@ -664,13 +665,15 @@ Vector<JS::Handle<Box>> TreeBuilder::generate_missing_parents(NodeWithStyle& roo
 
         auto* nearest_sibling = table_box->next_sibling();
 
         auto* nearest_sibling = table_box->next_sibling();
 
         auto& parent = *table_box->parent();
 
         auto& parent = *table_box->parent();
 
 
 
-        CSS::ComputedValues wrapper_computed_values;
 
+        CSS::ComputedValues wrapper_computed_values = table_box->computed_values().clone_inherited_values();
 
         table_box->transfer_table_box_computed_values_to_wrapper_computed_values(wrapper_computed_values);
 
         table_box->transfer_table_box_computed_values_to_wrapper_computed_values(wrapper_computed_values);
 
 
 
         auto wrapper = parent.heap().allocate_without_realm<TableWrapper>(parent.document(), nullptr, move(wrapper_computed_values));
 
         auto wrapper = parent.heap().allocate_without_realm<TableWrapper>(parent.document(), nullptr, move(wrapper_computed_values));
 
 
 
         parent.remove_child(*table_box);
 
         parent.remove_child(*table_box);
 
         wrapper->append_child(*table_box);
 
         wrapper->append_child(*table_box);
 
+        wrapper->set_font(parent.font());
 
+        wrapper->set_line_height(parent.line_height());
 
 
 
         if (nearest_sibling)
 
         if (nearest_sibling)
 
             parent.insert_before(*wrapper, *nearest_sibling);
 
             parent.insert_before(*wrapper, *nearest_sibling);
 
@@ -705,6 +708,8 @@ static void fixup_row(Box& row_box, TableGrid const& table_grid, size_t row_inde
 
         // Ensure that the cell (with zero content height) will have the same height as the row by setting vertical-align to middle.
 
         // Ensure that the cell (with zero content height) will have the same height as the row by setting vertical-align to middle.
 
         cell_computed_values.set_vertical_align(CSS::VerticalAlign::Middle);
 
         cell_computed_values.set_vertical_align(CSS::VerticalAlign::Middle);
 
         auto cell_box = row_box.heap().template allocate_without_realm<BlockContainer>(row_box.document(), nullptr, cell_computed_values);
 
         auto cell_box = row_box.heap().template allocate_without_realm<BlockContainer>(row_box.document(), nullptr, cell_computed_values);
 
+        cell_box->set_font(row_box.font());
 
+        cell_box->set_line_height(row_box.line_height());
 
         row_box.append_child(cell_box);
 
         row_box.append_child(cell_box);
 
     }
 
     }
 
 }
 
 }

Contact | Legal | Takedown | Status
Self-hosted public services - About
NibbleSpot by 0ct0pu5