tordex · tordex · commit 2175d1f2fe98 · 2013-06-25T20:48:42.000Z
diff --git a/litebrowser/HtmlViewWnd.cpp b/litebrowser/HtmlViewWnd.cpp
@@ -142,12 +142,23 @@ void CHTMLViewWnd::OnPaint( simpledib::dib* dib, LPRECT rcDraw )
 {
 	if(m_doc)
 	{
-		cairo_dev cr(dib);
+		cairo_surface_t* surface = cairo_image_surface_create_for_data((unsigned char*) dib->bits(), CAIRO_FORMAT_ARGB32, dib->width(), dib->height(), dib->width() * 4);
+		cairo_t* cr = cairo_create(surface);
+
+		POINT pt;
+		GetWindowOrgEx(dib->hdc(), &pt);
+		if(pt.x != 0 || pt.y != 0)
+		{
+			cairo_translate(cr, -pt.x, -pt.y);
+		}
 		cairo_set_source_rgb(cr, 1, 1, 1);
 		cairo_paint(cr);
 
 		litehtml::position clip(rcDraw->left, rcDraw->top, rcDraw->right - rcDraw->left, rcDraw->bottom - rcDraw->top);
-		m_doc->draw((litehtml::uint_ptr) dib, -m_left, -m_top, &clip);
+		m_doc->draw((litehtml::uint_ptr) cr, -m_left, -m_top, &clip);
+
+		cairo_destroy(cr);
+		cairo_surface_destroy(surface);
 	}
 }
 
diff --git a/litebrowser/ToolbarWnd.cpp b/litebrowser/ToolbarWnd.cpp
@@ -125,12 +125,23 @@ void CToolbarWnd::OnPaint( simpledib::dib* dib, LPRECT rcDraw )
 {
 	if(m_doc)
 	{
-		cairo_dev cr(dib);
+		cairo_surface_t* surface = cairo_image_surface_create_for_data((unsigned char*) dib->bits(), CAIRO_FORMAT_ARGB32, dib->width(), dib->height(), dib->width() * 4);
+		cairo_t* cr = cairo_create(surface);
+
+		POINT pt;
+		GetWindowOrgEx(dib->hdc(), &pt);
+		if(pt.x != 0 || pt.y != 0)
+		{
+			cairo_translate(cr, -pt.x, -pt.y);
+		}
 		cairo_set_source_rgb(cr, 1, 1, 1);
 		cairo_paint(cr);
 
 		litehtml::position clip(rcDraw->left, rcDraw->top, rcDraw->right - rcDraw->left, rcDraw->bottom - rcDraw->top);
 		m_doc->draw((litehtml::uint_ptr) dib, 0, 0, &clip);
+
+		cairo_destroy(cr);
+		cairo_surface_destroy(surface);
 	}
 }
 
diff --git a/litehtml/element.cpp b/litehtml/element.cpp
@@ -440,7 +440,7 @@ void litehtml::element::parse_styles(bool is_reparse)
 int litehtml::element::render( int x, int y, int max_width )
 {
 /*
-	if(is_body())
+	if(m_tag == L"div")
 	{
 		int iii = 0;
 		iii++;
@@ -2104,6 +2104,10 @@ int litehtml::element::place_element( element* el, int max_width )
 		}
 		add_float(el);
 		fix_line_width(max_width);
+
+		line_left	= get_line_left(line_top);
+		line_right	= get_line_right(line_top, max_width);
+
 		ret_width = line_left + (max_width - line_right);
 	} else
 	{

Original file line number	Diff line number	Diff line change
`@@ -142,12 +142,23 @@ void CHTMLViewWnd::OnPaint( simpledib::dib* dib, LPRECT rcDraw )`
`142`	`142`	`{`
`143`	`143`	`if(m_doc)`
`144`	`144`	`{`
`145`		`- cairo_dev cr(dib);`
	`145`	`+ cairo_surface_t* surface = cairo_image_surface_create_for_data((unsigned char) dib->bits(), CAIRO_FORMAT_ARGB32, dib->width(), dib->height(), dib->width() 4);`
	`146`	`+ cairo_t* cr = cairo_create(surface);`
	`147`	`+`
	`148`	`+ POINT pt;`
	`149`	`+ GetWindowOrgEx(dib->hdc(), &pt);`
	`150`	`+ if(pt.x != 0 \|\| pt.y != 0)`
	`151`	`+ {`
	`152`	`+ cairo_translate(cr, -pt.x, -pt.y);`
	`153`	`+ }`
`146`	`154`	`cairo_set_source_rgb(cr, 1, 1, 1);`
`147`	`155`	`cairo_paint(cr);`
`148`	`156`
`149`	`157`	`litehtml::position clip(rcDraw->left, rcDraw->top, rcDraw->right - rcDraw->left, rcDraw->bottom - rcDraw->top);`
`150`		`- m_doc->draw((litehtml::uint_ptr) dib, -m_left, -m_top, &clip);`
	`158`	`+ m_doc->draw((litehtml::uint_ptr) cr, -m_left, -m_top, &clip);`
	`159`	`+`
	`160`	`+ cairo_destroy(cr);`
	`161`	`+ cairo_surface_destroy(surface);`
`151`	`162`	`}`
`152`	`163`	`}`
`153`	`164`
Original file line number	Diff line number	Diff line change
`@@ -125,12 +125,23 @@ void CToolbarWnd::OnPaint( simpledib::dib* dib, LPRECT rcDraw )`
`125`	`125`	`{`
`126`	`126`	`if(m_doc)`
`127`	`127`	`{`
`128`		`- cairo_dev cr(dib);`
	`128`	`+ cairo_surface_t* surface = cairo_image_surface_create_for_data((unsigned char) dib->bits(), CAIRO_FORMAT_ARGB32, dib->width(), dib->height(), dib->width() 4);`
	`129`	`+ cairo_t* cr = cairo_create(surface);`
	`130`	`+`
	`131`	`+ POINT pt;`
	`132`	`+ GetWindowOrgEx(dib->hdc(), &pt);`
	`133`	`+ if(pt.x != 0 \|\| pt.y != 0)`
	`134`	`+ {`
	`135`	`+ cairo_translate(cr, -pt.x, -pt.y);`
	`136`	`+ }`
`129`	`137`	`cairo_set_source_rgb(cr, 1, 1, 1);`
`130`	`138`	`cairo_paint(cr);`
`131`	`139`
`132`	`140`	`litehtml::position clip(rcDraw->left, rcDraw->top, rcDraw->right - rcDraw->left, rcDraw->bottom - rcDraw->top);`
`133`	`141`	`m_doc->draw((litehtml::uint_ptr) dib, 0, 0, &clip);`
	`142`	`+`
	`143`	`+ cairo_destroy(cr);`
	`144`	`+ cairo_surface_destroy(surface);`
`134`	`145`	`}`
`135`	`146`	`}`
`136`	`147`
Original file line number	Diff line number	Diff line change
`@@ -440,7 +440,7 @@ void litehtml::element::parse_styles(bool is_reparse)`
`440`	`440`	`int litehtml::element::render( int x, int y, int max_width )`
`441`	`441`	`{`
`442`	`442`	`/*`
`443`		`- if(is_body())`
	`443`	`+ if(m_tag == L"div")`
`444`	`444`	`{`
`445`	`445`	`int iii = 0;`
`446`	`446`	`iii++;`
`@@ -2104,6 +2104,10 @@ int litehtml::element::place_element( element* el, int max_width )`
`2104`	`2104`	`}`
`2105`	`2105`	`add_float(el);`
`2106`	`2106`	`fix_line_width(max_width);`
	`2107`	`+`
	`2108`	`+ line_left = get_line_left(line_top);`
	`2109`	`+ line_right = get_line_right(line_top, max_width);`
	`2110`	`+`
`2107`	`2111`	`ret_width = line_left + (max_width - line_right);`
`2108`	`2112`	`} else`
`2109`	`2113`	`{`