fixed table rendering

tordex · tordex · commit 109a837ef6a3 · 2023-04-14T00:40:39.000+03:00
diff --git a/src/render_block.cpp b/src/render_block.cpp
@@ -672,10 +672,14 @@ int litehtml::render_item_block::_render(int x, int y, int max_width, const cont
 
 	containing_block_context cb_size = calculate_containing_block_context(containing_block_size);
 
+	max_width -= content_offset_left() + content_offset_right();
+	if(max_width < 0) max_width = 0;
+	max_width = std::min(max_width, cb_size.width);
+
     //*****************************************
     // Render content
     //*****************************************
-    ret_width = _render_content(x, y, cb_size.width, second_pass, ret_width, cb_size);
+    ret_width = _render_content(x, y, max_width, second_pass, ret_width, cb_size);
     //*****************************************
 
 	bool requires_rerender = false;
@@ -685,6 +689,7 @@ int litehtml::render_item_block::_render(int x, int y, int max_width, const cont
 		(src_el()->is_inline_box() ||
 		 src_el()->css().get_float() != float_none ||
 		 src_el()->css().get_display() == display_table_cell ||
+		 src_el()->css().get_display() == display_table_caption ||
 		 src_el()->css().get_position() > element_position_relative
 		 ))
 	{
@@ -790,14 +795,12 @@ int litehtml::render_item_block::_render(int x, int y, int max_width, const cont
 		_render_content(x, y, cb_size.width, true, ret_width, cb_size);
     }
 
-	ret_width += content_offset_left() + content_offset_right();
-
     if (src_el()->is_floats_holder() && !second_pass)
     {
         for (const auto& fb : m_floats_left)
         {
             fb.el->apply_relative_shift(containing_block_size);
         }
     }
-    return ret_width;
+    return ret_width + content_offset_width();
 }
diff --git a/src/render_item.cpp b/src/render_item.cpp
@@ -1001,6 +1001,10 @@ litehtml::containing_block_context litehtml::render_item::calculate_containing_b
 	if (src_el()->css().get_display() != display_table_cell)
 	{
 		calc_cb_length(src_el()->css().get_width(), cb_context.width, ret.width, ret.width_type);
+		if (src_el()->css().get_display() == display_table && ret.width_type != containing_block_context::cbc_value_type_auto)
+		{
+			ret.width -= content_offset_width();
+		}
 	}
 	calc_cb_length(src_el()->css().get_min_width(), cb_context.width, ret.min_width, ret.min_width_type);
 	calc_cb_length(src_el()->css().get_max_width(), cb_context.width, ret.max_width, ret.max_width_type);
diff --git a/src/render_table.cpp b/src/render_table.cpp
@@ -25,6 +25,16 @@ int litehtml::render_item_table::_render(int x, int y, int max_width, const cont
 
 	containing_block_context cb_size = calculate_containing_block_context(containing_block_size);
 
+	if(cb_size.width_type == containing_block_context::cbc_value_type_auto)
+	{
+		max_width -= content_offset_left() + content_offset_right();
+	} else
+	{
+		max_width -= m_padding.width() + m_borders.width();
+	}
+	if(max_width < 0) max_width = 0;
+	max_width = std::min(max_width, cb_size.width);
+
     // Calculate table spacing
     int table_width_spacing = 0;
     if (src_el()->css().get_border_collapse() == border_collapse_separate)
@@ -87,7 +97,7 @@ int litehtml::render_item_table::_render(int x, int y, int max_width, const cont
                     else
                     {
                         // calculate minimum content width
-                        cell->min_width = cell->el->render(0, 0, 1, cb_size);
+                        cell->min_width = cell->el->render(0, 0, cell->el->content_offset_width(), cb_size);
                         // calculate maximum content width
                         cell->max_width = cell->el->render(0, 0, max_width - table_width_spacing, cb_size);
                     }
@@ -327,8 +337,6 @@ int litehtml::render_item_table::_render(int x, int y, int max_width, const cont
         table_height += m_border_spacing_y;
     }
 
-    m_pos.width = table_width;
-
     // Render table captions
     // Table border doesn't round the caption, so we have to start caption in the border position
     int captions_height = -border_top();
@@ -370,7 +378,7 @@ int litehtml::render_item_table::_render(int x, int y, int max_width, const cont
     m_pos.width = table_width;
     m_pos.height = table_height + captions_height;
 
-    return std::min(table_width, max_table_width) + content_offset_left() + content_offset_right();
+    return std::min(table_width, max_table_width) + content_offset_width();
 }
 
 std::shared_ptr<litehtml::render_item> litehtml::render_item_table::init()
diff --git a/test/render/table-4-td-width.htm.png b/test/render/table-4-td-width.htm.png

Original file line number	Diff line number	Diff line change
`@@ -672,10 +672,14 @@ int litehtml::render_item_block::_render(int x, int y, int max_width, const cont`
`672`	`672`
`673`	`673`	`containing_block_context cb_size = calculate_containing_block_context(containing_block_size);`
`674`	`674`
	`675`	`+ max_width -= content_offset_left() + content_offset_right();`
	`676`	`+ if(max_width < 0) max_width = 0;`
	`677`	`+ max_width = std::min(max_width, cb_size.width);`
	`678`	`+`
`675`	`679`	`//*****************************************`
`676`	`680`	`// Render content`
`677`	`681`	`//*****************************************`
`678`		`- ret_width = _render_content(x, y, cb_size.width, second_pass, ret_width, cb_size);`
	`682`	`+ ret_width = _render_content(x, y, max_width, second_pass, ret_width, cb_size);`
`679`	`683`	`//*****************************************`
`680`	`684`
`681`	`685`	`bool requires_rerender = false;`
`@@ -685,6 +689,7 @@ int litehtml::render_item_block::_render(int x, int y, int max_width, const cont`
`685`	`689`	`(src_el()->is_inline_box() \|\|`
`686`	`690`	`src_el()->css().get_float() != float_none \|\|`
`687`	`691`	`src_el()->css().get_display() == display_table_cell \|\|`
	`692`	`+ src_el()->css().get_display() == display_table_caption \|\|`
`688`	`693`	`src_el()->css().get_position() > element_position_relative`
`689`	`694`	`))`
`690`	`695`	`{`
`@@ -790,14 +795,12 @@ int litehtml::render_item_block::_render(int x, int y, int max_width, const cont`
`790`	`795`	`_render_content(x, y, cb_size.width, true, ret_width, cb_size);`
`791`	`796`	`}`
`792`	`797`
`793`		`- ret_width += content_offset_left() + content_offset_right();`
`794`		`-`
`795`	`798`	`if (src_el()->is_floats_holder() && !second_pass)`
`796`	`799`	`{`
`797`	`800`	`for (const auto& fb : m_floats_left)`
`798`	`801`	`{`
`799`	`802`	`fb.el->apply_relative_shift(containing_block_size);`
`800`	`803`	`}`
`801`	`804`	`}`
`802`		`- return ret_width;`
	`805`	`+ return ret_width + content_offset_width();`
`803`	`806`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1001,6 +1001,10 @@ litehtml::containing_block_context litehtml::render_item::calculate_containing_b`
`1001`	`1001`	`if (src_el()->css().get_display() != display_table_cell)`
`1002`	`1002`	`{`
`1003`	`1003`	`calc_cb_length(src_el()->css().get_width(), cb_context.width, ret.width, ret.width_type);`
	`1004`	`+ if (src_el()->css().get_display() == display_table && ret.width_type != containing_block_context::cbc_value_type_auto)`
	`1005`	`+ {`
	`1006`	`+ ret.width -= content_offset_width();`
	`1007`	`+ }`
`1004`	`1008`	`}`
`1005`	`1009`	`calc_cb_length(src_el()->css().get_min_width(), cb_context.width, ret.min_width, ret.min_width_type);`
`1006`	`1010`	`calc_cb_length(src_el()->css().get_max_width(), cb_context.width, ret.max_width, ret.max_width_type);`