fixed rendering elements with position absoute and fixed

tordex · tordex · commit 819c20e6825e · 2023-05-12T17:29:44.000+03:00
Also:
* refactoring: have_parent is replaced with is_root in render_item
* fixed: The tag &lt;body&gt; is not floats holder by default
* expanding &lt;html&gt; and &lt;body&gt; elements auto-expanding up to client
  rectangle
diff --git a/include/litehtml/render_item.h b/include/litehtml/render_item.h
@@ -273,10 +273,10 @@ namespace litehtml
 			return 0;
 		}
 
-        bool have_parent() const
-        {
-            return !m_parent.expired();
-        }
+		bool is_root() const
+		{
+			return m_parent.expired();
+		}
 
         bool collapse_top_margin() const
         {
@@ -285,7 +285,7 @@ namespace litehtml
                    m_element->in_normal_flow() &&
                    m_element->css().get_float() == float_none &&
                    m_margins.top >= 0 &&
-                   have_parent();
+                   !is_root();
         }
 
         bool collapse_bottom_margin() const
@@ -295,7 +295,7 @@ namespace litehtml
                    m_element->in_normal_flow() &&
                    m_element->css().get_float() == float_none &&
                    m_margins.bottom >= 0 &&
-                   have_parent();
+                   !is_root();
         }
 
         bool is_visible() const
diff --git a/src/html_tag.cpp b/src/html_tag.cpp
@@ -1068,7 +1068,6 @@ bool litehtml::html_tag::is_floats_holder() const
 	if(	m_css.get_display() == display_inline_block || 
 		m_css.get_display() == display_table_cell ||
 		is_root() ||
-		is_body() || 
 		m_css.get_float() != float_none ||
 		m_css.get_position() == element_position_absolute ||
 		m_css.get_position() == element_position_fixed ||
diff --git a/src/render_block.cpp b/src/render_block.cpp
@@ -789,7 +789,7 @@ int litehtml::render_item_block::render(int x, int y, const containing_block_con
     }
 
     // re-render content with new width if required
-    if (requires_rerender && !second_pass && have_parent())
+    if (requires_rerender && !second_pass && !is_root())
     {
 		m_floats_left.clear();
 		m_floats_right.clear();
@@ -799,18 +799,6 @@ int litehtml::render_item_block::render(int x, int y, const containing_block_con
 		_render_content(x, y, true, ret_width, self_size.new_width(m_pos.width));
     }
 
-	if(src_el()->is_root() || src_el()->is_body())
-	{
-		if(self_size.width.type == containing_block_context::cbc_value_type_auto && m_pos.width < containing_block_size.width - content_offset_width())
-		{
-			m_pos.width = containing_block_size.width - content_offset_width();
-		}
-		if(self_size.height.type == containing_block_context::cbc_value_type_auto && m_pos.height < containing_block_size.height - content_offset_height())
-		{
-			m_pos.height = containing_block_size.height - content_offset_height();
-		}
-	}
-
     if (src_el()->is_floats_holder() && !second_pass)
     {
         for (const auto& fb : m_floats_left)
diff --git a/src/render_item.cpp b/src/render_item.cpp
@@ -464,7 +464,7 @@ void litehtml::render_item::render_positioned(render_type rt)
 
 void litehtml::render_item::add_positioned(const std::shared_ptr<litehtml::render_item> &el)
 {
-    if (src_el()->css().get_position() != element_position_static || (!have_parent()))
+    if (src_el()->css().get_position() != element_position_static || is_root())
     {
         m_positioned.push_back(el);
     } else
@@ -1002,7 +1002,10 @@ litehtml::containing_block_context litehtml::render_item::calculate_containing_b
 {
 	containing_block_context ret;
 	ret.width.value = ret.max_width.value = cb_context.width.value - content_offset_width();
-	ret.height.value = cb_context.height.value - content_offset_height();
+	if(src_el()->css().get_position() != element_position_absolute && src_el()->css().get_position() != element_position_fixed)
+	{
+		ret.height.value = cb_context.height.value - content_offset_height();
+	}
 
 	// Calculate width if css property is not auto
 	// We have to use aut value for display_table_cell also.

Original file line number	Diff line number	Diff line change
`@@ -464,7 +464,7 @@ void litehtml::render_item::render_positioned(render_type rt)`
`464`	`464`
`465`	`465`	`void litehtml::render_item::add_positioned(const std::shared_ptr<litehtml::render_item> &el)`
`466`	`466`	`{`
`467`		`- if (src_el()->css().get_position() != element_position_static \|\| (!have_parent()))`
	`467`	`+ if (src_el()->css().get_position() != element_position_static \|\| is_root())`
`468`	`468`	`{`
`469`	`469`	`m_positioned.push_back(el);`
`470`	`470`	`} else`
`@@ -1002,7 +1002,10 @@ litehtml::containing_block_context litehtml::render_item::calculate_containing_b`
`1002`	`1002`	`{`
`1003`	`1003`	`containing_block_context ret;`
`1004`	`1004`	`ret.width.value = ret.max_width.value = cb_context.width.value - content_offset_width();`
`1005`		`- ret.height.value = cb_context.height.value - content_offset_height();`
	`1005`	`+ if(src_el()->css().get_position() != element_position_absolute && src_el()->css().get_position() != element_position_fixed)`
	`1006`	`+ {`
	`1007`	`+ ret.height.value = cb_context.height.value - content_offset_height();`
	`1008`	`+ }`
`1006`	`1009`
`1007`	`1010`	`// Calculate width if css property is not auto`
`1008`	`1011`	`// We have to use aut value for display_table_cell also.`