fix: the issue where :hover/:active are not triggered by on_mouse_leave and on_button_cancel

NiuGuohui · tordex · commit b51b5acab566 · 2025-08-24T02:34:55.000+03:00
diff --git a/src/document.cpp b/src/document.cpp
@@ -685,9 +685,11 @@ bool document::on_mouse_leave( position::vector& redraw_boxes )
 	}
 	if(m_over_element)
 	{
-		if(m_over_element->on_mouse_leave())
+		auto el = m_over_element;
+		m_over_element = nullptr;
+		if(el->on_mouse_leave())
 		{
-			m_container->on_mouse_event(m_over_element, mouse_event_leave);
+			m_container->on_mouse_event(el, mouse_event_leave);
 			return m_root->find_styles_changes(redraw_boxes);
 		}
 	}
@@ -765,23 +767,8 @@ bool document::on_lbutton_up( pixel_t /*x*/, pixel_t /*y*/, pixel_t /*client_x*/
 }
 
 bool document::on_button_cancel(position::vector& redraw_boxes) {
-    if(!m_root || !m_root_render)
-    {
-        return false;
-    }
 	m_active_element = nullptr;
-    if(m_over_element)
-    {
-        if(m_over_element->on_mouse_leave())
-        {
-            m_container->on_mouse_event(m_over_element, mouse_event_leave);
-        }
-        if(m_over_element->on_lbutton_up(false))
-        {
-            return m_root->find_styles_changes(redraw_boxes);
-        }
-    }
-    return false;
+	return on_mouse_leave(redraw_boxes);
 }
 
 void document::get_fixed_boxes( position::vector& fixed_boxes )

Original file line number	Diff line number	Diff line change
`@@ -685,9 +685,11 @@ bool document::on_mouse_leave( position::vector& redraw_boxes )`
`685`	`685`	`}`
`686`	`686`	`if(m_over_element)`
`687`	`687`	`{`
`688`		`- if(m_over_element->on_mouse_leave())`
	`688`	`+ auto el = m_over_element;`
	`689`	`+ m_over_element = nullptr;`
	`690`	`+ if(el->on_mouse_leave())`
`689`	`691`	`{`
`690`		`- m_container->on_mouse_event(m_over_element, mouse_event_leave);`
	`692`	`+ m_container->on_mouse_event(el, mouse_event_leave);`
`691`	`693`	`return m_root->find_styles_changes(redraw_boxes);`
`692`	`694`	`}`
`693`	`695`	`}`
`@@ -765,23 +767,8 @@ bool document::on_lbutton_up( pixel_t /x/, pixel_t /y/, pixel_t /client_x/`
`765`	`767`	`}`
`766`	`768`
`767`	`769`	`bool document::on_button_cancel(position::vector& redraw_boxes) {`
`768`		`- if(!m_root \|\| !m_root_render)`
`769`		`- {`
`770`		`- return false;`
`771`		`- }`
`772`	`770`	`m_active_element = nullptr;`
`773`		`- if(m_over_element)`
`774`		`- {`
`775`		`- if(m_over_element->on_mouse_leave())`
`776`		`- {`
`777`		`- m_container->on_mouse_event(m_over_element, mouse_event_leave);`
`778`		`- }`
`779`		`- if(m_over_element->on_lbutton_up(false))`
`780`		`- {`
`781`		`- return m_root->find_styles_changes(redraw_boxes);`
`782`		`- }`
`783`		`- }`
`784`		`- return false;`
	`771`	`+ return on_mouse_leave(redraw_boxes);`
`785`	`772`	`}`
`786`	`773`
`787`	`774`	`void document::get_fixed_boxes( position::vector& fixed_boxes )`