Merge pull request #14 from stasoid/master

update for latest litehtml
litehtml · Dec 5, 2022 · 1a95391 · 1a95391
2 parents 25e22d7 + 620cf2d
commit 1a95391
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 7 deletions.
diff --git a/libs/litehtml b/libs/litehtml
diff --git a/src/el_omnibox.cpp b/src/el_omnibox.cpp
@@ -37,11 +37,11 @@ void el_omnibox::draw(litehtml::uint_ptr hdc, int x, int y, const litehtml::posi
 	m_edit.draw((cairo_t*)hdc);
 }
 
-void el_omnibox::parse_styles(bool is_reparse)
+void el_omnibox::compute_styles(bool recursive)
 {
-	litehtml::html_tag::parse_styles(is_reparse);
+	litehtml::html_tag::compute_styles(recursive);
 
-	m_edit.setFont((cairo_font*)css().get_font(), get_color(litehtml::_color_, true));
+	m_edit.setFont((cairo_font*)css().get_font(), css().get_color());
 }
 
 void el_omnibox::set_parent(HWND parent)

diff --git a/src/el_omnibox.h b/src/el_omnibox.h
@@ -12,9 +12,9 @@ class el_omnibox : public litehtml::html_tag
 	el_omnibox(const std::shared_ptr<litehtml::document>& doc, HWND parent, cairo_container* container);
 	~el_omnibox();
 
-	virtual void draw(litehtml::uint_ptr hdc, int x, int y, const litehtml::position* clip, const std::shared_ptr<litehtml::render_item>& ri) override;
-	virtual void parse_styles(bool is_reparse);
-	virtual void on_click();
+	void draw(litehtml::uint_ptr hdc, int x, int y, const litehtml::position* clip, const std::shared_ptr<litehtml::render_item>& ri) override;
+	void compute_styles(bool recursive) override;
+	void on_click() override;
 
 	BOOL have_focus()
 	{
+1 −24		CMakeLists.txt
+2 −2		containers/cairo/cairo_container.cpp
+1 −1		containers/haiku/container_haiku.cpp
+1 −1		containers/linux/container_linux.cpp
+0 −54		containers/test/container_test.cpp
+0 −44		containers/test/container_test.h
+1 −1		containers/win32/win32_container.cpp
+0 −35		include/litehtml/attributes.h
+0 −1		include/litehtml/background.h
+2 −2		include/litehtml/borders.h
+10 −29		include/litehtml/css_length.h
+1 −1		include/litehtml/css_margins.h
+1 −1		include/litehtml/css_offsets.h
+628 −590		include/litehtml/css_properties.h
+21 −12		include/litehtml/css_selector.h
+1 −1		include/litehtml/el_before_after.h
+2 −2		include/litehtml/el_image.h
+1 −0		include/litehtml/el_script.h
+1 −0		include/litehtml/el_style.h
+2 −3		include/litehtml/el_text.h
+40 −35		include/litehtml/element.h
+8 −2		include/litehtml/html.h
+29 −19		include/litehtml/html_tag.h
+158 −3		include/litehtml/string_id.h
+71 −46		include/litehtml/style.h
+1 −1		include/litehtml/stylesheet.h
+123 −118		include/litehtml/types.h
+7 −20		include/litehtml/web_color.h
+0 −1		litehtml.vcxproj
+0 −3		litehtml.vcxproj.filters
+1 −1		src/css_borders.cpp
+16 −2		src/css_length.cpp
+425 −569		src/css_properties.cpp
+110 −57		src/css_selector.cpp
+35 −31		src/document.cpp
+1 −1		src/el_anchor.cpp
+4 −10		src/el_before_after.cpp
+2 −2		src/el_div.cpp
+8 −8		src/el_font.cpp
+5 −6		src/el_image.cpp
+1 −1		src/el_para.cpp
+5 −0		src/el_script.cpp
+5 −0		src/el_style.cpp
+12 −12		src/el_table.cpp
+5 −5		src/el_td.cpp
+3 −17		src/el_text.cpp
+3 −3		src/el_tr.cpp
+198 −205		src/element.cpp
+393 −396		src/html_tag.cpp
+1 −1		src/line_box.cpp
+13 −12		src/render_block.cpp
+8 −4		src/render_flex.cpp
+15 −6		src/string_id.cpp
+720 −479		src/style.cpp
+6 −4		src/stylesheet.cpp
+14 −10		src/web_color.cpp
+51 −465		test/cssTest.cpp
+0 −96		test/documentTest.cpp
+0 −12		test/layoutGlobalTest.cpp
+0 −15		test/mediaQueryTest.cpp
+0 −20		test/webColorTest.cpp