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

Merge pull request #5108 from darina/follow-anim-reset

Browse source 
Do not rewind follow animations.
This commit is contained in:
Roman Kuznetsov 2017-01-09 09:50:13 +03:00 • committed by GitHub
commit e1dd06edd9
2 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
drape_frontend/user_event_stream.cpp
View file

@ -493,7 +493,7 @@ bool UserEventStream::InterruptFollowAnimations(bool force)
if (followAnim != nullptr)
{
if (force || followAnim->CouldBeInterrupted())
ResetAnimations(followAnim->GetType(), followAnim->GetCustomType());
ResetAnimations(followAnim->GetType(), followAnim->GetCustomType(), !followAnim->CouldBeInterrupted());
else
return false;
}
@ -577,18 +577,18 @@ void UserEventStream::SetAutoPerspective(bool isAutoPerspective)
return;
}
void UserEventStream::ResetAnimations(Animation::Type animType, bool finishAll)
void UserEventStream::ResetAnimations(Animation::Type animType, bool rewind, bool finishAll)
{
bool const hasAnimations = m_animationSystem.HasAnimations();
m_animationSystem.FinishAnimations(animType, true /* rewind */, finishAll);
m_animationSystem.FinishAnimations(animType, rewind, finishAll);
if (hasAnimations)
ApplyAnimations();
}
void UserEventStream::ResetAnimations(Animation::Type animType, string const & customType, bool finishAll)
void UserEventStream::ResetAnimations(Animation::Type animType, string const & customType, bool rewind, bool finishAll)
{
bool const hasAnimations = m_animationSystem.HasAnimations();
m_animationSystem.FinishAnimations(animType, customType, true /* rewind */, finishAll);
m_animationSystem.FinishAnimations(animType, customType, rewind, finishAll);
if (hasAnimations)
ApplyAnimations();
}

4
drape_frontend/user_event_stream.hpp
View file

@ -452,8 +452,8 @@ private:
void CancelFilter(Touch const & t);
void ApplyAnimations();
void ResetAnimations(Animation::Type animType, bool finishAll = false);
void ResetAnimations(Animation::Type animType, string const & customType, bool finishAll = false);
void ResetAnimations(Animation::Type animType, bool rewind = true, bool finishAll = false);
void ResetAnimations(Animation::Type animType, string const & customType, bool rewind = true, bool finishAll = false);
void ResetMapPlaneAnimations();
bool InterruptFollowAnimations(bool force);