Merge pull request #285 from litehtml/flex_layoutHEADv0.9dev

Flex layout

1 files changed, 4 insertions, 4 deletions

diff --git a/src/render_table.cpp b/src/render_table.cpp
index 1a385964..fdff1f82 100644
--- a/src/render_table.cpp
+++ b/src/render_table.cpp
@@ -261,10 +261,10 @@ int litehtml::render_item_table::_render(int x, int y, const containing_block_co
 
     // calculate block height
     int block_height = 0;
-    if (get_predefined_height(block_height, containing_block_size.height))
-    {
-        block_height -= m_padding.height() + m_borders.height();
-    }
+	if(self_size.height.type != containing_block_context::cbc_value_type_auto && self_size.height > 0)
+	{
+		block_height = self_size.height - (m_padding.height() + m_borders.height());
+	}
 
     // calculate minimum height from m_css.get_min_height()
     int min_height = 0;