update windows project to add poly2tri

This commit is contained in:
2017-10-09 09:40:40 +01:00
parent 78ec5a079e
commit 163937b4a6
8 changed files with 88 additions and 36 deletions

View File

@@ -50,31 +50,36 @@ kEventResult Node::on_event(Event* e)
{
kEventResult ret = kEventResult::Available;
if (current_mouse_capture)
return current_mouse_capture->on_event(e);
bool skip_children = false;
skip_children |= (e->m_cat == kEventCategory::MouseEvent || e->m_cat == kEventCategory::GestureEvent) &&
(m_mouse_captured) && (root()->current_mouse_capture == this) && m_capture_children;
if (!skip_children)
if (e->m_cat == kEventCategory::MouseEvent)
{
for (auto it = m_children.rbegin(); it != m_children.rend(); ++it)
{
if ((*it)->on_event(e) == kEventResult::Consumed)
if (current_mouse_capture)
return current_mouse_capture->on_event(e);
bool skip_children = false;
skip_children |= (e->m_cat == kEventCategory::MouseEvent || e->m_cat == kEventCategory::GestureEvent) &&
(m_mouse_captured) && (root()->current_mouse_capture == this) && m_capture_children;
if (!skip_children)
{
if (m_flood_events)
for (auto it = m_children.rbegin(); it != m_children.rend(); ++it)
{
ret = kEventResult::Consumed;
}
else
{
return kEventResult::Consumed;
if ((*it)->on_event(e) == kEventResult::Consumed)
{
if (m_flood_events)
{
ret = kEventResult::Consumed;
}
else
{
return kEventResult::Consumed;
}
}
}
if (ret == kEventResult::Consumed)
return ret;
}
}
if (ret == kEventResult::Consumed)
return ret;
}
switch (e->m_cat)