Fixed child hover detection
This commit is contained in:
parent
031c61146b
commit
451748c785
2 changed files with 17 additions and 3 deletions
|
|
@ -379,8 +379,10 @@ void GUIManager::mouse_callback(const Vector2f& mousePos, const std::function<vo
|
||||||
cursorObstructed = true;
|
cursorObstructed = true;
|
||||||
e->elem->mouseHovering = true;
|
e->elem->mouseHovering = true;
|
||||||
Element* nextParent = e->elem->parent;
|
Element* nextParent = e->elem->parent;
|
||||||
while(nextParent)
|
while(nextParent) {
|
||||||
nextParent->childMouseHovering |= true;
|
nextParent->childMouseHovering |= true;
|
||||||
|
nextParent = nextParent->parent;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
e->elem->mouseHovering = false;
|
e->elem->mouseHovering = false;
|
||||||
|
|
|
||||||
|
|
@ -37,24 +37,31 @@ class GUIManager {
|
||||||
|
|
||||||
template <typename ElementType, typename... Args> ElementType* element(const char* id, const Args&... a) {
|
template <typename ElementType, typename... Args> ElementType* element(const char* id, const Args&... a) {
|
||||||
push_id(id);
|
push_id(id);
|
||||||
|
|
||||||
Element* oldParent = parentElement;
|
Element* oldParent = parentElement;
|
||||||
ElementType* elem = insert_element<ElementType>();
|
ElementType* elem = insert_element<ElementType>();
|
||||||
elem->parent = parentElement;
|
elem->parent = parentElement;
|
||||||
Clay_ElementId clayId = strArena.elem_id_from_id_stack(idStack);
|
parentElement = elem;
|
||||||
|
|
||||||
elem->set_parent_clipping_region(clippingRegion);
|
elem->set_parent_clipping_region(clippingRegion);
|
||||||
|
Clay_ElementId clayId = strArena.elem_id_from_id_stack(idStack);
|
||||||
elem->layout(clayId, a...);
|
elem->layout(clayId, a...);
|
||||||
elem->set_bounding_box_from_elem_data(Clay_GetElementData(clayId)); // Setting bounding box after layout ensures that the element will have its bounding box set if it's set to be drawn.
|
elem->set_bounding_box_from_elem_data(Clay_GetElementData(clayId)); // Setting bounding box after layout ensures that the element will have its bounding box set if it's set to be drawn.
|
||||||
|
|
||||||
parentElement = oldParent;
|
parentElement = oldParent;
|
||||||
|
|
||||||
pop_id();
|
pop_id();
|
||||||
return elem;
|
return elem;
|
||||||
}
|
}
|
||||||
|
|
||||||
template <typename ElementType, typename... Args> ElementType* clipping_element(const char* id, const Args&... a) {
|
template <typename ElementType, typename... Args> ElementType* clipping_element(const char* id, const Args&... a) {
|
||||||
push_id(id);
|
push_id(id);
|
||||||
|
|
||||||
Element* oldParent = parentElement;
|
Element* oldParent = parentElement;
|
||||||
ElementType* elem = insert_element<ElementType>();
|
ElementType* elem = insert_element<ElementType>();
|
||||||
elem->parent = parentElement;
|
elem->parent = parentElement;
|
||||||
Clay_ElementId clayId = strArena.elem_id_from_id_stack(idStack);
|
parentElement = elem;
|
||||||
|
|
||||||
elem->set_parent_clipping_region(clippingRegion);
|
elem->set_parent_clipping_region(clippingRegion);
|
||||||
auto oldClippingRegion = clippingRegion;
|
auto oldClippingRegion = clippingRegion;
|
||||||
if(elem->get_bb().has_value()) {
|
if(elem->get_bb().has_value()) {
|
||||||
|
|
@ -63,10 +70,15 @@ class GUIManager {
|
||||||
else
|
else
|
||||||
clippingRegion = elem->get_bb();
|
clippingRegion = elem->get_bb();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Clay_ElementId clayId = strArena.elem_id_from_id_stack(idStack);
|
||||||
elem->layout(clayId, a...);
|
elem->layout(clayId, a...);
|
||||||
elem->set_bounding_box_from_elem_data(Clay_GetElementData(clayId));
|
elem->set_bounding_box_from_elem_data(Clay_GetElementData(clayId));
|
||||||
|
|
||||||
clippingRegion = oldClippingRegion;
|
clippingRegion = oldClippingRegion;
|
||||||
|
|
||||||
parentElement = oldParent;
|
parentElement = oldParent;
|
||||||
|
|
||||||
pop_id();
|
pop_id();
|
||||||
return elem;
|
return elem;
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue