RedAuburn/organicmaps
1
Fork 0
forked from organicmaps/organicmaps
Code Pull requests Activity

Fixed assert on scale or drag.

Browse source
This commit is contained in:
Daria Volvenkova 2016-03-18 14:19:26 +03:00 • committed by Sergey Yershov
parent 7217cbfdb4
commit 37dfa2d1a9
1 changed files with 18 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
drape_frontend/user_event_stream.cpp
View file

@ -697,12 +697,26 @@ bool UserEventStream::TouchMove(array<Touch, 2> const & touches, double timestam
isMapTouch = false;
break;
case STATE_DRAG:
ASSERT_EQUAL(touchCount, 1, ());
Drag(touches[0], timestamp);
if (touchCount > 1)
{
ASSERT_EQUAL(GetValidTouchesCount(m_touches), 1, ());
EndDrag(m_touches[0], true /* cancelled */);
}
else
{
Drag(touches[0], timestamp);
}
break;
case STATE_SCALE:
ASSERT_EQUAL(touchCount, 2, ());
Scale(touches[0], touches[1]);
if (touchCount < 2)
{
ASSERT_EQUAL(GetValidTouchesCount(m_touches), 2, ());
EndScale(m_touches[0], m_touches[1]);
}
else
{
Scale(touches[0], touches[1]);
}
break;
default:
ASSERT(false, ());