fix android compile, fix windows system info log, implement touch/stylus events on windows

This commit is contained in:
2018-10-08 21:13:44 +02:00
parent 365af43891
commit dba5eef824
9 changed files with 65 additions and 33 deletions

View File

@@ -49,11 +49,11 @@ kEventResult NodeButtonCustom::handle_event(Event* e)
mouse_capture();
break;
case kEventType::MouseUpL:
#if defined(__IOS__) || defined(__ANDROID__)
m_color = color_normal;
#else
// if using touch or stylus, unfocus the button
if (((MouseEvent*)e)->m_source == kEventSource::Mouse)
m_color = m_mouse_inside ? color_hover : color_normal;
#endif
else
m_color = color_normal;
mouse_release();
if (m_mouse_inside && on_click != nullptr)
on_click(this);