Fixed incorrect table height.

tordex · tordex · commit f2b5e9dd3b6b · 2015-08-26T14:30:37.000+03:00
diff --git a/litehtml.sln b/litehtml.sln
diff --git a/src/html_tag.cpp b/src/html_tag.cpp
@@ -4421,6 +4421,28 @@ int litehtml::html_tag::render_table(int x, int y, int max_width, bool second_pa
 		}
 	}
 
+	// Calculate vertical table spacing
+	int table_height_spacing = 0;
+	if (m_border_collapse == border_collapse_separate)
+	{
+		table_height_spacing = m_border_spacing_y * (m_grid->rows_count() + 1);
+	}
+	else
+	{
+		table_height_spacing = 0;
+
+		if (m_grid->rows_count())
+		{
+			table_height_spacing -= std::min(border_top(), m_grid->row(0).border_top);
+			table_height_spacing -= std::min(border_bottom(), m_grid->row(m_grid->rows_count() - 1).border_bottom);
+		}
+
+		for (int row = 1; row < m_grid->rows_count(); row++)
+		{
+			table_height_spacing -= std::min(m_grid->row(row).border_top, m_grid->row(row - 1).border_bottom);
+		}
+	}
+
 
 	// calculate block height
 	int block_height = 0;
@@ -4451,7 +4473,7 @@ int litehtml::html_tag::render_table(int x, int y, int max_width, bool second_pa
 	int extra_row_height = 0;
 	int minimum_table_height = std::max(block_height, min_height);
 
-	m_grid->calc_rows_height(minimum_table_height, m_border_spacing_y);
+	m_grid->calc_rows_height(minimum_table_height - table_height_spacing, m_border_spacing_y);
 	m_grid->calc_vertical_positions(m_borders, m_border_collapse, m_border_spacing_y);
 
 	int table_height = 0;
diff --git a/src/table.cpp b/src/table.cpp
@@ -117,10 +117,9 @@ void litehtml::table_grid::finish()
 
 			if(cell(col, row)->el && cell(col, row)->colspan <= 1)
 			{
-				if(!cell(col, row)->el->get_css_width().is_predefined())
+				if (!cell(col, row)->el->get_css_width().is_predefined() && m_columns[col].css_width.is_predefined())
 				{
 					m_columns[col].css_width = cell(col, row)->el->get_css_width();
-					break;
 				}
 			}
 		}
@@ -474,7 +473,7 @@ void litehtml::table_grid::calc_rows_height(int blockHeight, int borderSpacingY)
 		min_table_height += row.height;
 	}
 
-	min_table_height += borderSpacingY * ((int) m_rows.size() + 1);
+	//min_table_height += borderSpacingY * ((int) m_rows.size() + 1);
 
 	if (blockHeight > min_table_height)
 	{

Original file line number	Diff line number	Diff line change
`@@ -117,10 +117,9 @@ void litehtml::table_grid::finish()`
`117`	`117`
`118`	`118`	`if(cell(col, row)->el && cell(col, row)->colspan <= 1)`
`119`	`119`	`{`
`120`		`- if(!cell(col, row)->el->get_css_width().is_predefined())`
	`120`	`+ if (!cell(col, row)->el->get_css_width().is_predefined() && m_columns[col].css_width.is_predefined())`
`121`	`121`	`{`
`122`	`122`	`m_columns[col].css_width = cell(col, row)->el->get_css_width();`
`123`		`- break;`
`124`	`123`	`}`
`125`	`124`	`}`
`126`	`125`	`}`
`@@ -474,7 +473,7 @@ void litehtml::table_grid::calc_rows_height(int blockHeight, int borderSpacingY)`
`474`	`473`	`min_table_height += row.height;`
`475`	`474`	`}`
`476`	`475`
`477`		`- min_table_height += borderSpacingY * ((int) m_rows.size() + 1);`
	`476`	`+ //min_table_height += borderSpacingY * ((int) m_rows.size() + 1);`
`478`	`477`
`479`	`478`	`if (blockHeight > min_table_height)`
`480`	`479`	`{`