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

Fixed false turning on of kinetic scroll

Browse source
This commit is contained in:
r.kuznetsov 2015-09-02 16:04:00 +03:00
parent 0a3690c042
commit b769d15d66
2 changed files with 6 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
drape_frontend/user_event_stream.cpp
View file

@ -18,6 +18,7 @@ namespace
uint64_t const DOUBLE_TAP_PAUSE = 250;
uint64_t const LONG_TOUCH_MS = 1000;
uint64_t const kKineticDelayMs = 500;
size_t GetValidTouchesCount(array<Touch, 2> const & touches)
{
@ -310,7 +311,8 @@ bool UserEventStream::ProcessTouch(TouchEvent const & touch)
case TouchEvent::TOUCH_UP:
{
isMapTouch |= TouchUp(touchEvent.m_touches);
if (isMapTouch && touchEvent.GetMaskedCount() == GetValidTouchesCount(touchEvent.m_touches))
if (isMapTouch && touchEvent.GetMaskedCount() == GetValidTouchesCount(touchEvent.m_touches) &&
m_kineticTimer.ElapsedMillis() >= kKineticDelayMs)
{
m_scroller.GrabViewRect(m_navigator.Screen(), touch.m_timeStamp);
m_animation = m_scroller.CreateKineticAnimation(m_navigator.Screen());
@ -573,6 +575,8 @@ void UserEventStream::EndScale(const Touch & t1, const Touch & t2)
}
m_navigator.StopScale(touch1, touch2);
m_kineticTimer.Reset();
}
void UserEventStream::BeginTapDetector()

1
drape_frontend/user_event_stream.hpp
View file

@ -288,6 +288,7 @@ private:
m2::PointD m_startDragOrg;
KineticScroller m_scroller;
my::HighResTimer m_kineticTimer;
};
}