We use cookies to ensure you get the best experience on our website
Home Esplora Aiuto
Registrati Accedi
0ct0pu5
/
ladybird
1
0
Forka 0
File Problemi 0 Pull Requests 0 Wiki
Sfoglia il codice sorgente

LibWeb: Don't use the preferred increment as reference for distribution

The specification says we should distribute excess width proportionally
to the width of the cell, not to the preferred increment. Doing the
latter leads to distributing all excess width to just the cells which
demand some increment, even if it's very modest. Moreover, there's code
which partially implements the correct criteria just below the one we
remove here.
Andi Gallo 2 anni fa
parent
13687085dd
commit
030b1a197b
5 ha cambiato i file con 93 aggiunte e 14 eliminazioni
Visualizzazione unificata Mostra Diff Stats
  1. 5 5
      Tests/LibWeb/Layout/expected/table/cell-auto-max-width-table-percentage-width.txt
  2. 38 0
      Tests/LibWeb/Layout/expected/table/width-distribution-of-max-width-increment.txt
  3. 0 0
      Tests/LibWeb/Layout/input/table/cell-auto-max-width-table-percentage-width.html
  4. 24 0
      Tests/LibWeb/Layout/input/table/width-distribution-of-max-width-increment.html
  5. 26 9
      Userland/Libraries/LibWeb/Layout/TableFormattingContext.cpp

+ 5 - 5
Tests/LibWeb/Layout/expected/cell-auto-max-width-table-percentage-width.txt → Tests/LibWeb/Layout/expected/table/cell-auto-max-width-table-percentage-width.txt
Vedi File 

@@ -14,23 +14,23 @@ Viewport <#document> at (0,0) content-size 800x600 children: not-inline
 
               Box <tr> at (10,10) content-size 72x19.46875 table-row children: not-inline
 
               Box <tr> at (10,10) content-size 72x19.46875 table-row children: not-inline
 
                 BlockContainer <(anonymous)> (not painted) children: inline
 
                 BlockContainer <(anonymous)> (not painted) children: inline
 
                   TextNode <#text>
 
                   TextNode <#text>
 
-                BlockContainer <td> at (11,11) content-size 14.265625x17.46875 table-cell [BFC] children: inline
 
+                BlockContainer <td> at (11,11) content-size 17.828571x17.46875 table-cell [BFC] children: inline
 
                   line 0 width: 14.265625, height: 17.46875, bottom: 17.46875, baseline: 13.53125
 
                   line 0 width: 14.265625, height: 17.46875, bottom: 17.46875, baseline: 13.53125
 
                     frag 0 from TextNode start: 0, length: 1, rect: [11,11 14.265625x17.46875]
 
                     frag 0 from TextNode start: 0, length: 1, rect: [11,11 14.265625x17.46875]
 
                       "A"
 
                       "A"
 
                   TextNode <#text>
 
                   TextNode <#text>
 
                 BlockContainer <(anonymous)> (not painted) children: inline
 
                 BlockContainer <(anonymous)> (not painted) children: inline
 
                   TextNode <#text>
 
                   TextNode <#text>
 
-                BlockContainer <td> at (29.265625,11) content-size 9.34375x17.46875 table-cell [BFC] children: inline
 
+                BlockContainer <td> at (32.828571,11) content-size 11.828571x17.46875 table-cell [BFC] children: inline
 
                   line 0 width: 9.34375, height: 17.46875, bottom: 17.46875, baseline: 13.53125
 
                   line 0 width: 9.34375, height: 17.46875, bottom: 17.46875, baseline: 13.53125
 
-                    frag 0 from TextNode start: 0, length: 1, rect: [29.265625,11 9.34375x17.46875]
 
+                    frag 0 from TextNode start: 0, length: 1, rect: [32.828571,11 9.34375x17.46875]
 
                       "B"
 
                       "B"
 
                   TextNode <#text>
 
                   TextNode <#text>
 
                 BlockContainer <(anonymous)> (not painted) children: inline
 
                 BlockContainer <(anonymous)> (not painted) children: inline
 
                   TextNode <#text>
 
                   TextNode <#text>
 
-                BlockContainer <td> at (42.609375,11) content-size 42.390625x17.46875 table-cell [BFC] children: inline
 
+                BlockContainer <td> at (48.657142,11) content-size 36.342857x17.46875 table-cell [BFC] children: inline
 
                   line 0 width: 29.453125, height: 17.46875, bottom: 17.46875, baseline: 13.53125
 
                   line 0 width: 29.453125, height: 17.46875, bottom: 17.46875, baseline: 13.53125
 
-                    frag 0 from TextNode start: 0, length: 3, rect: [42.609375,11 29.453125x17.46875]
 
+                    frag 0 from TextNode start: 0, length: 3, rect: [48.657142,11 29.453125x17.46875]
 
                       "C D"
 
                       "C D"
 
                   TextNode <#text>
 
                   TextNode <#text>
 
                 BlockContainer <(anonymous)> (not painted) children: inline
 
                 BlockContainer <(anonymous)> (not painted) children: inline

+ 38 - 0
Tests/LibWeb/Layout/expected/table/width-distribution-of-max-width-increment.txt
Vedi File 

@@ -0,0 +1,38 @@
 
+Viewport <#document> at (0,0) content-size 800x600 children: not-inline
 
+  BlockContainer <html> at (0,0) content-size 800x600 [BFC] children: not-inline
 
+    BlockContainer <body> at (8,8) content-size 784x21.46875 children: not-inline
 
+      TableWrapper <(anonymous)> at (8,8) content-size 784x21.46875 [BFC] children: not-inline
 
+        Box <table> at (8,8) content-size 784x21.46875 table-box [TFC] children: not-inline
 
+          BlockContainer <(anonymous)> (not painted) children: inline
 
+            TextNode <#text>
 
+          Box <tbody> at (8,8) content-size 784x21.46875 table-row-group children: not-inline
 
+            BlockContainer <(anonymous)> (not painted) children: inline
 
+              TextNode <#text>
 
+            Box <tr> at (8,8) content-size 784x21.46875 table-row children: not-inline
 
+              BlockContainer <(anonymous)> (not painted) children: inline
 
+                TextNode <#text>
 
+              BlockContainer <td> at (10,10) content-size 216.099903x17.46875 table-cell [BFC] children: inline
 
+                line 0 width: 14.265625, height: 17.46875, bottom: 17.46875, baseline: 13.53125
 
+                  frag 0 from TextNode start: 1, length: 1, rect: [10,10 14.265625x17.46875]
 
+                    "A"
 
+                TextNode <#text>
 
+              BlockContainer <(anonymous)> (not painted) children: inline
 
+                TextNode <#text>
 
+              BlockContainer <td> at (230.099903,10) content-size 156.791546x17.46875 table-cell [BFC] children: inline
 
+                line 0 width: 9.34375, height: 17.46875, bottom: 17.46875, baseline: 13.53125
 
+                  frag 0 from TextNode start: 1, length: 1, rect: [230.099903,10 9.34375x17.46875]
 
+                    "B"
 
+                TextNode <#text>
 
+              BlockContainer <(anonymous)> (not painted) children: inline
 
+                TextNode <#text>
 
+              BlockContainer <td> at (390.891450,10) content-size 399.108549x17.46875 table-cell [BFC] children: inline
 
+                line 0 width: 29.453125, height: 17.46875, bottom: 17.46875, baseline: 13.53125
 
+                  frag 0 from TextNode start: 1, length: 3, rect: [390.891450,10 29.453125x17.46875]
 
+                    "C D"
 
+                TextNode <#text>
 
+              BlockContainer <(anonymous)> (not painted) children: inline
 
+                TextNode <#text>
 
+            BlockContainer <(anonymous)> (not painted) children: inline
 
+              TextNode <#text>
 
+          BlockContainer <(anonymous)> (not painted) children: inline
 
+            TextNode <#text>

+ 0 - 0
Tests/LibWeb/Layout/input/cell-auto-max-width-table-percentage-width.html → Tests/LibWeb/Layout/input/table/cell-auto-max-width-table-percentage-width.html
Vedi File


+ 24 - 0
Tests/LibWeb/Layout/input/table/width-distribution-of-max-width-increment.html
Vedi File 

@@ -0,0 +1,24 @@
 
+<style>
 
+    td {
 
+        border: 1px solid black;
 
+    }
 
+
 
+    table {
 
+        border-collapse: collapse;
 
+    }
 
+</style>
 
+<table width="100%">
 
+    <tbody>
 
+        <tr>
 
+            <td>
 
+                A
 
+            </td>
 
+            <td>
 
+                B
 
+            </td>
 
+            <td>
 
+                C D
 
+            </td>
 
+        </tr>
 
+    </tbody>
 
+</table>

+ 26 - 9
Userland/Libraries/LibWeb/Layout/TableFormattingContext.cpp
Vedi File 

@@ -532,10 +532,16 @@ void TableFormattingContext::distribute_width_to_columns()
 
         expand_columns_to_fill_available_width(column_type);
 
         expand_columns_to_fill_available_width(column_type);
 
     };
 
     };
 
 
 
+    // 1. The min-content sizing-guess is the set of column width assignments where each column is assigned its min-content width.
 
     for (auto& column : m_columns) {
 
     for (auto& column : m_columns) {
 
         column.used_width = column.min_size;
 
         column.used_width = column.min_size;
 
     }
 
     }
 
 
 
+    // 2. The min-content-percentage sizing-guess is the set of column width assignments where:
 
+    //    - each percent-column is assigned the larger of:
 
+    //      - its intrinsic percentage width times the assignable width and
 
+    //      - its min-content width.
 
+    //    - all other columns are assigned their min-content width.
 
     for (auto& column : m_columns) {
 
     for (auto& column : m_columns) {
 
         if (column.type == SizeType::Percent) {
 
         if (column.type == SizeType::Percent) {
 
             column.used_width = max(column.min_size, column.percentage_width / 100 * available_width);
 
             column.used_width = max(column.min_size, column.percentage_width / 100 * available_width);
 
@@ -547,6 +553,12 @@ void TableFormattingContext::distribute_width_to_columns()
 
         return;
 
         return;
 
     }
 
     }
 
 
 
+    // 3. The min-content-specified sizing-guess is the set of column width assignments where:
 
+    //    - each percent-column is assigned the larger of:
 
+    //      - its intrinsic percentage width times the assignable width and
 
+    //      - its min-content width
 
+    //    - any other column that is constrained is assigned its max-content width
 
+    //    - all other columns are assigned their min-content width.
 
     for (auto& column : m_columns) {
 
     for (auto& column : m_columns) {
 
         if (column.type == SizeType::Pixel) {
 
         if (column.type == SizeType::Pixel) {
 
             column.used_width = column.max_size;
 
             column.used_width = column.max_size;
 
@@ -558,20 +570,25 @@ void TableFormattingContext::distribute_width_to_columns()
 
         return;
 
         return;
 
     }
 
     }
 
 
 
-    if (columns_total_used_width() < available_width) {
 
-        expand_columns_to_fill_available_width(SizeType::Auto);
 
+    // 4. The max-content sizing-guess is the set of column width assignments where:
 
+    //    - each percent-column is assigned the larger of:
 
+    //      - its intrinsic percentage width times the assignable width and
 
+    //      - its min-content width
 
+    //    - all other columns are assigned their max-content width.
 
+    for (auto& column : m_columns) {
 
+        if (column.type != SizeType::Percent) {
 
+            column.used_width = column.max_size;
 
+        }
 
     }
 
     }
 
 
 
-    if (columns_total_used_width() < available_width) {
 
-        expand_columns_to_fill_available_width(SizeType::Pixel);
 
-    }
 
+    // If the assignable table width is less than or equal to the max-content sizing-guess, the used widths of the columns must be the
 
+    // linear combination (with weights adding to 1) of the two consecutive sizing-guesses whose width sums bound the available width.
 
 
 
-    if (columns_total_used_width() < available_width) {
 
-        expand_columns_to_fill_available_width(SizeType::Percent);
 
-    }
 
+    // Otherwise, the used widths of the columns are the result of starting from the max-content sizing-guess and distributing
 
+    // the excess width to the columns of the table according to the rules for distributing excess width to columns (for used width).
 
 
 
     // Implements steps 1 and 2 of https://www.w3.org/TR/css-tables-3/#distributing-width-to-columns
 
     // Implements steps 1 and 2 of https://www.w3.org/TR/css-tables-3/#distributing-width-to-columns
 
-    // FIXME: Implement steps 3-5 as well, which distribute excess width to constrained columns.
 
+    // FIXME: Implement steps 3-6 as well, which distribute excess width to constrained columns.
 
     if (columns_total_used_width() < available_width) {
 
     if (columns_total_used_width() < available_width) {
 
         // NOTE: if all columns got their max width and there is still width to distribute left
 
         // NOTE: if all columns got their max width and there is still width to distribute left
 
         // it should be assigned to columns proportionally to their max width
 
         // it should be assigned to columns proportionally to their max width

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