diff --git a/libs/litehtml b/libs/litehtml index d3335a4..6ff7733 160000 --- a/libs/litehtml +++ b/libs/litehtml @@ -1 +1 @@ -Subproject commit d3335a4f16c01423b5b7f83b47395626e4812590 +Subproject commit 6ff77337fd63cf5c0edf24d7457518f1e883c103 diff --git a/src/el_omnibox.cpp b/src/el_omnibox.cpp index b230cbf..6f1b303 100644 --- 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 index b41b300..643db7a 100644 --- 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& 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& 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& ri) override; + void compute_styles(bool recursive) override; + void on_click() override; BOOL have_focus() {