feat: Implements element click event API in document_container.

NiuGuohui · tordex · commit 165bed42c0f1 · 2025-04-02T23:04:48.000+03:00
diff --git a/include/litehtml/document_container.h b/include/litehtml/document_container.h
@@ -55,7 +55,7 @@ namespace litehtml
 		virtual	void				set_base_url(const char* base_url) = 0;
 		virtual void				link(const std::shared_ptr<litehtml::document>& doc, const litehtml::element::ptr& el) = 0;
 		virtual void				on_anchor_click(const char* url, const litehtml::element::ptr& el) = 0;
-		virtual void				on_image_click(const char* /*src*/, const litehtml::element::ptr& /*el*/) {};
+		virtual bool				on_element_click(const litehtml::element::ptr& /*el*/) { return false; };
 		virtual void				on_mouse_event(const litehtml::element::ptr& el, litehtml::mouse_event event) = 0;
 		virtual	void				set_cursor(const char* cursor) = 0;
 		virtual	void				transform_text(litehtml::string& text, litehtml::text_transform tt) = 0;
diff --git a/include/litehtml/el_image.h b/include/litehtml/el_image.h
@@ -12,7 +12,6 @@ namespace litehtml
 	public:
 		el_image(const document::ptr& doc);
 
-        void	on_click() override;
 		bool	is_replaced() const override;
 		void	parse_attributes() override;
 		void	compute_styles(bool recursive = true) override;
diff --git a/src/document.cpp b/src/document.cpp
@@ -767,6 +767,7 @@ bool document::on_button_cancel(position::vector& redraw_boxes) {
     {
         return false;
     }
+	m_active_element = nullptr;
     if(m_over_element)
     {
         if(m_over_element->on_mouse_leave())
diff --git a/src/el_image.cpp b/src/el_image.cpp
@@ -82,13 +82,4 @@ std::shared_ptr<litehtml::render_item> litehtml::el_image::create_render_item(co
 	auto ret = std::make_shared<render_item_image>(shared_from_this());
 	ret->parent(parent_ri);
 	return ret;
-}
-
-void litehtml::el_image::on_click() {
-    const char* src = get_attr("src");
-
-    if(src)
-    {
-        get_document()->container()->on_image_click(src, shared_from_this());
-    }
-}
+}
diff --git a/src/html_tag.cpp b/src/html_tag.cpp
@@ -839,10 +839,13 @@ void litehtml::html_tag::on_click()
 {
 	if (!is_root())
 	{
-		element::ptr el_parent = parent();
-		if (el_parent)
+		if(!get_document()->container()->on_element_click(shared_from_this()))
 		{
-			el_parent->on_click();
+			element::ptr el_parent = parent();
+			if (el_parent)
+			{
+				el_parent->on_click();
+			}
 		}
 	}
 }

Original file line number	Diff line number	Diff line change
`@@ -767,6 +767,7 @@ bool document::on_button_cancel(position::vector& redraw_boxes) {`
`767`	`767`	`{`
`768`	`768`	`return false;`
`769`	`769`	`}`
	`770`	`+ m_active_element = nullptr;`
`770`	`771`	`if(m_over_element)`
`771`	`772`	`{`
`772`	`773`	`if(m_over_element->on_mouse_leave())`
Original file line number	Diff line number	Diff line change
`@@ -839,10 +839,13 @@ void litehtml::html_tag::on_click()`
`839`	`839`	`{`
`840`	`840`	`if (!is_root())`
`841`	`841`	`{`
`842`		`- element::ptr el_parent = parent();`
`843`		`- if (el_parent)`
	`842`	`+ if(!get_document()->container()->on_element_click(shared_from_this()))`
`844`	`843`	`{`
`845`		`- el_parent->on_click();`
	`844`	`+ element::ptr el_parent = parent();`
	`845`	`+ if (el_parent)`
	`846`	`+ {`
	`847`	`+ el_parent->on_click();`
	`848`	`+ }`
`846`	`849`	`}`
`847`	`850`	`}`
`848`	`851`	`}`