Separate fixed elements rendering, mark root element background.

tordex · tordex · commit 0afcf0c06a38 · 2014-09-04T04:48:47.000+04:00
document::render accept render_type parameter:
render_all - render all elements
render_no_fixed - don't render fixed elements
render_fixed_only - render the fixed elements only
background_paint now have is_root member. You can check is_root to draw background in entire window (not in paint rectangle only).
diff --git a/src/background.cpp b/src/background.cpp
@@ -45,17 +45,35 @@ litehtml::background& litehtml::background::operator=( const background& val )
 
 litehtml::background_paint::background_paint() : color(0, 0, 0, 0)
 {
-	position_x	= 0;
-	position_y	= 0;
-	attachment	= background_attachment_scroll;
-	repeat		= background_repeat_repeat;
+	position_x		= 0;
+	position_y		= 0;
+	attachment		= background_attachment_scroll;
+	repeat			= background_repeat_repeat;
+	is_root			= false;
+}
+
+litehtml::background_paint::background_paint( const background_paint& val )
+{
+	image			= val.image;
+	baseurl			= val.baseurl;
+	attachment		= val.attachment;
+	repeat			= val.repeat;
+	color			= val.color;
+	clip_box		= val.clip_box;
+	origin_box		= val.origin_box;
+	border_box		= val.border_box;
+	border_radius	= val.border_radius;
+	image_size		= val.image_size;
+	position_x		= val.position_x;
+	position_y		= val.position_y;
+	is_root			= val.is_root;
 }
 
 void litehtml::background_paint::operator=( const background& val )
 {
 	attachment	= val.m_attachment;
 	baseurl		= val.m_baseurl;
 	image		= val.m_image;
-	repeat	= val.m_repeat;
+	repeat		= val.m_repeat;
 	color		= val.m_color;
 }
diff --git a/src/background.h b/src/background.h
@@ -44,8 +44,10 @@ namespace litehtml
 		size					image_size;
 		int						position_x;
 		int						position_y;
+		bool					is_root;
 	public:
 		background_paint();
+		background_paint(const background_paint& val);
 		void operator=(const background& val);
 	};
 
diff --git a/src/box.cpp b/src/box.cpp
@@ -173,8 +173,8 @@ void litehtml::line_box::add_element( element* el )
 			int el_shift_left	= el->get_inline_shift_left();
 			int el_shift_right	= el->get_inline_shift_right();
 
-			el->m_pos.x	= m_box_left + m_width + el_shift_left;
-			el->m_pos.y	= m_box_top;
+			el->m_pos.x	= m_box_left + m_width + el_shift_left + el->content_margins_left();
+			el->m_pos.y	= m_box_top + el->content_margins_top();
 			m_width		+= el->width() + el_shift_left + el_shift_right;
 		}
 	}
diff --git a/src/document.cpp b/src/document.cpp
@@ -322,20 +322,27 @@ litehtml::element* litehtml::document::add_body()
 	return el;
 }
 
-int litehtml::document::render( int max_width )
+int litehtml::document::render( int max_width, render_type rt )
 {
 	int ret = 0;
 	if(m_root)
 	{
-		ret = m_root->render(0, 0, max_width);
-		if(m_root->fetch_positioned())
+		if(rt == render_fixed_only)
 		{
 			m_fixed_boxes.clear();
-			m_root->render_positioned();
+			m_root->render_positioned(rt);
+		} else
+		{
+			ret = m_root->render(0, 0, max_width);
+			if(m_root->fetch_positioned())
+			{
+				m_fixed_boxes.clear();
+				m_root->render_positioned(rt);
+			}
+			m_size.width	= 0;
+			m_size.height	= 0;
+			m_root->calc_document_size(m_size);
 		}
-		m_size.width	= 0;
-		m_size.height	= 0;
-		m_root->calc_document_size(m_size);
 	}
 	return ret;
 }
diff --git a/src/document.h b/src/document.h
@@ -77,7 +77,7 @@ namespace litehtml
 
 		litehtml::document_container*	container()	{ return m_container; }
 		uint_ptr						get_font(const tchar_t* name, int size, const tchar_t* weight, const tchar_t* style, const tchar_t* decoration, font_metrics* fm);
-		int								render(int max_width);
+		int								render(int max_width, render_type rt = render_all);
 		void							draw(uint_ptr hdc, int x, int y, const position* clip);
 		web_color						get_def_color()	{ return m_def_color; }
 		int								cvt_units(const tchar_t* str, int fontSize, bool* is_percent = 0) const;
diff --git a/src/element.cpp b/src/element.cpp
@@ -250,7 +250,7 @@ bool litehtml::element::is_only_child(element* el, bool of_type)					LITEHTML_RE
 litehtml::overflow litehtml::element::get_overflow() const							LITEHTML_RETURN_FUNC(overflow_visible)
 void litehtml::element::draw_children( uint_ptr hdc, int x, int y, const position* clip, draw_flag flag, int zindex ) LITEHTML_EMPTY_FUNC
 void litehtml::element::draw_stacking_context( uint_ptr hdc, int x, int y, const position* clip, bool with_positioned ) LITEHTML_EMPTY_FUNC
-void litehtml::element::render_positioned()											LITEHTML_EMPTY_FUNC
+void litehtml::element::render_positioned(render_type rt)							LITEHTML_EMPTY_FUNC
 int litehtml::element::get_zindex() const											LITEHTML_RETURN_FUNC(0)
 bool litehtml::element::fetch_positioned()											LITEHTML_RETURN_FUNC(false)
 litehtml::visibility litehtml::element::get_visibility() const						LITEHTML_RETURN_FUNC(visibility_visible)
diff --git a/src/element.h b/src/element.h
@@ -84,7 +84,7 @@ namespace litehtml
 		virtual void				calc_outlines( int parent_width );
 		virtual void				apply_vertical_align();
 		virtual bool				fetch_positioned();
-		virtual void				render_positioned();
+		virtual void				render_positioned(render_type rt = render_all);
 
 		virtual bool				appendChild(litehtml::element* el);
 
diff --git a/src/html_tag.cpp b/src/html_tag.cpp
@@ -2834,6 +2834,7 @@ void litehtml::html_tag::init_background_paint( position pos, background_paint &
 	}
 	bg_paint.border_radius	= m_css_borders.radius;
 	bg_paint.border_box		= border_box;
+	bg_paint.is_root		= parent() ? false : true;
 }
 
 litehtml::visibility litehtml::html_tag::get_visibility() const
@@ -3021,19 +3022,38 @@ int litehtml::html_tag::get_zindex() const
 	return m_z_index;
 }
 
-void litehtml::html_tag::render_positioned()
+void litehtml::html_tag::render_positioned(render_type rt)
 {
 	position wnd_position;
 	m_doc->container()->get_client_rect(wnd_position);
 
 	element_position el_position;
 	element* el;
+	bool process;
 	for(elements_vector::iterator abs_el = m_positioned.begin(); abs_el != m_positioned.end(); abs_el++)
 	{
 		el = (*abs_el);
 		el_position = el->get_element_position();
 
-		if(el->get_display() != display_none && (el_position == element_position_absolute || el_position == element_position_fixed))
+		process = false;
+		if(el->get_display() != display_none)
+		{
+			if(el_position == element_position_absolute)
+			{
+				if(rt != render_fixed_only)
+				{
+					process = true;
+				}
+			} else if(el_position == element_position_fixed)
+			{
+				if(rt != render_no_fixed)
+				{
+					process = true;
+				}
+			}
+		}
+
+		if(process)
 		{
 			int parent_height	= 0;
 			int parent_width	= 0;
diff --git a/src/html_tag.h b/src/html_tag.h
@@ -80,7 +80,7 @@ namespace litehtml
 		virtual int					render_inline(element* container, int max_width);
 		virtual int					place_element(element* el, int max_width);
 		virtual bool				fetch_positioned();
-		virtual void				render_positioned();
+		virtual void				render_positioned(render_type rt = render_all);
 
 		int							new_box( element* el, int max_width );
 
diff --git a/src/types.h b/src/types.h
@@ -674,4 +674,11 @@ namespace litehtml
 		int			resolution;		// The resolution of the output device (in DPI)
 	};
 
+	enum render_type
+	{
+		render_all,
+		render_no_fixed,
+		render_fixed_only,
+	};
+
 }

Original file line number	Diff line number	Diff line change
`@@ -173,8 +173,8 @@ void litehtml::line_box::add_element( element* el )`
`173`	`173`	`int el_shift_left = el->get_inline_shift_left();`
`174`	`174`	`int el_shift_right = el->get_inline_shift_right();`
`175`	`175`
`176`		`- el->m_pos.x = m_box_left + m_width + el_shift_left;`
`177`		`- el->m_pos.y = m_box_top;`
	`176`	`+ el->m_pos.x = m_box_left + m_width + el_shift_left + el->content_margins_left();`
	`177`	`+ el->m_pos.y = m_box_top + el->content_margins_top();`
`178`	`178`	`m_width += el->width() + el_shift_left + el_shift_right;`
`179`	`179`	`}`
`180`	`180`	`}`
Original file line number	Diff line number	Diff line change
`@@ -322,20 +322,27 @@ litehtml::element* litehtml::document::add_body()`
`322`	`322`	`return el;`
`323`	`323`	`}`
`324`	`324`
`325`		`-int litehtml::document::render( int max_width )`
	`325`	`+int litehtml::document::render( int max_width, render_type rt )`
`326`	`326`	`{`
`327`	`327`	`int ret = 0;`
`328`	`328`	`if(m_root)`
`329`	`329`	`{`
`330`		`- ret = m_root->render(0, 0, max_width);`
`331`		`- if(m_root->fetch_positioned())`
	`330`	`+ if(rt == render_fixed_only)`
`332`	`331`	`{`
`333`	`332`	`m_fixed_boxes.clear();`
`334`		`- m_root->render_positioned();`
	`333`	`+ m_root->render_positioned(rt);`
	`334`	`+ } else`
	`335`	`+ {`
	`336`	`+ ret = m_root->render(0, 0, max_width);`
	`337`	`+ if(m_root->fetch_positioned())`
	`338`	`+ {`
	`339`	`+ m_fixed_boxes.clear();`
	`340`	`+ m_root->render_positioned(rt);`
	`341`	`+ }`
	`342`	`+ m_size.width = 0;`
	`343`	`+ m_size.height = 0;`
	`344`	`+ m_root->calc_document_size(m_size);`
`335`	`345`	`}`
`336`		`- m_size.width = 0;`
`337`		`- m_size.height = 0;`
`338`		`- m_root->calc_document_size(m_size);`
`339`	`346`	`}`
`340`	`347`	`return ret;`
`341`	`348`	`}`