table rendering fix

tordex · tordex · commit 24e622ed557b · 2023-04-15T18:45:22.000+03:00
diff --git a/src/render_table.cpp b/src/render_table.cpp
@@ -166,7 +166,7 @@ int litehtml::render_item_table::_render(int x, int y, int max_width, const cont
     int min_table_width = 0;
     int max_table_width = 0;
 
-    if (cb_size.width_type != containing_block_context::cbc_value_type_auto)
+    if (cb_size.width_type == containing_block_context::cbc_value_type_absolute)
     {
         table_width = m_grid->calc_table_width(cb_size.width - table_width_spacing, false, min_table_width, max_table_width);
     }
@@ -370,15 +370,17 @@ int litehtml::render_item_table::_render(int x, int y, int max_width, const cont
         }
     }
 
-    calc_auto_margins(containing_block_size.width);
+	int ret = std::min(table_width, max_table_width) + content_offset_width();
 
     m_pos.move_to(x, y);
-    m_pos.x += content_offset_left();
-    m_pos.y += content_offset_top();
     m_pos.width = table_width;
     m_pos.height = table_height + captions_height;
 
-    return std::min(table_width, max_table_width) + content_offset_width();
+	calc_auto_margins(containing_block_size.width);
+	m_pos.x += content_offset_left();
+	m_pos.y += content_offset_top();
+
+	return ret;
 }
 
 std::shared_ptr<litehtml::render_item> litehtml::render_item_table::init()
diff --git a/test/render/-test21.htm b/test/render/-test21.htm
@@ -0,0 +1,13 @@
+<table style="background-color: red; width: 300px">
+    <tr>
+        <td>
+            <table style="margin:0.5em auto">
+                <tr>
+                    <th>
+                        Lorem ipsum
+                    </th>
+                </tr>
+            </table>
+        </td>
+    </tr>
+</table>
diff --git a/test/render/test22.htm b/test/render/test22.htm
@@ -0,0 +1,9 @@
+<div style="background-color: red; width: 300px">
+    <table style="margin-left:auto; margin-right: auto">
+        <tr>
+            <th>
+                Lorem ipsum
+            </th>
+        </tr>
+    </table>
+</div>
diff --git a/test/render/test22.htm.png b/test/render/test22.htm.png
diff --git a/test/render/test23.htm b/test/render/test23.htm
@@ -0,0 +1,21 @@
+<style>
+    table {
+        border: none;
+        background-color: green;
+    }
+</style>
+
+<table>
+    <tr>
+        <td>
+            <table style="width: 100%; border: none; background-color: red">
+                <tr>
+                    <td>Pellentesque</td>
+                    <td>
+                        Duis rutrum nibh vestibulum finibus luctus. Sed ac gravida urna. Phasellus at est ut augue interdum condimentum. Nunc scelerisque, ligula a feugiat aliquet, est enim pulvinar nunc, at feugiat velit quam vel leo.
+                    </td>
+                </tr>
+            </table>
+        </td>
+    </tr>
+</table>
diff --git a/test/render/test23.htm.png b/test/render/test23.htm.png

Original file line number	Diff line number	Diff line change
`@@ -166,7 +166,7 @@ int litehtml::render_item_table::_render(int x, int y, int max_width, const cont`
`166`	`166`	`int min_table_width = 0;`
`167`	`167`	`int max_table_width = 0;`
`168`	`168`
`169`		`- if (cb_size.width_type != containing_block_context::cbc_value_type_auto)`
	`169`	`+ if (cb_size.width_type == containing_block_context::cbc_value_type_absolute)`
`170`	`170`	`{`
`171`	`171`	`table_width = m_grid->calc_table_width(cb_size.width - table_width_spacing, false, min_table_width, max_table_width);`
`172`	`172`	`}`
`@@ -370,15 +370,17 @@ int litehtml::render_item_table::_render(int x, int y, int max_width, const cont`
`370`	`370`	`}`
`371`	`371`	`}`
`372`	`372`
`373`		`- calc_auto_margins(containing_block_size.width);`
	`373`	`+ int ret = std::min(table_width, max_table_width) + content_offset_width();`
`374`	`374`
`375`	`375`	`m_pos.move_to(x, y);`
`376`		`- m_pos.x += content_offset_left();`
`377`		`- m_pos.y += content_offset_top();`
`378`	`376`	`m_pos.width = table_width;`
`379`	`377`	`m_pos.height = table_height + captions_height;`
`380`	`378`
`381`		`- return std::min(table_width, max_table_width) + content_offset_width();`
	`379`	`+ calc_auto_margins(containing_block_size.width);`
	`380`	`+ m_pos.x += content_offset_left();`
	`381`	`+ m_pos.y += content_offset_top();`
	`382`	`+`
	`383`	`+ return ret;`
`382`	`384`	`}`
`383`	`385`
`384`	`386`	`std::shared_ptr<litehtml::render_item> litehtml::render_item_table::init()`