fix touch and pen mixed in windows

This commit is contained in:
2018-10-14 00:09:49 +02:00
parent 64ce471ed8
commit ae05e56110
3 changed files with 37 additions and 24 deletions

View File

@@ -16,20 +16,20 @@ void CanvasModeBasicCamera::on_MouseEvent(MouseEvent* me, glm::vec2& loc)
switch (me->m_type)
{
case kEventType::MouseDownL:
if (canvas->m_touch_lock && me->m_source == kEventSource::Touch)
{
m_draggingR = true;
m_dragR_start = me->m_pos;
m_pan_start = canvas->m_pan;
node->mouse_capture();
}
// if (canvas->m_touch_lock && me->m_source == kEventSource::Touch)
// {
// m_draggingR = true;
// m_dragR_start = me->m_pos;
// m_pan_start = canvas->m_pan;
// node->mouse_capture();
// }
break;
case kEventType::MouseUpL:
if (canvas->m_touch_lock && me->m_source == kEventSource::Touch)
{
m_draggingR = false;
node->mouse_release();
}
// if (canvas->m_touch_lock && me->m_source == kEventSource::Touch)
// {
// m_draggingR = false;
// node->mouse_release();
// }
break;
case kEventType::MouseDownR:
if (App::I.keys[(int)kKey::KeyAlt])