diff options
| author | Roman Kuznetsov <r.kuznetsow@gmail.com> | 2017-01-09 09:50:13 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-01-09 09:50:13 +0300 |
| commit | e1dd06edd940c15a2b7f23f8a1ac1ca75e55e5e2 (patch) | |
| tree | 08677b326e803016a93f29b3422c25eec523fb08 | |
| parent | 3a5233c6c58d75e32e96593889a45fd1142a80e2 (diff) | |
| parent | d4675739eaa6de668559e7863ebd0fdb47f5876b (diff) | |
Merge pull request #5108 from darina/follow-anim-resetbeta-560
Do not rewind follow animations.
| -rw-r--r-- | drape_frontend/user_event_stream.cpp | 10 | ||||
| -rw-r--r-- | drape_frontend/user_event_stream.hpp | 4 |
2 files changed, 7 insertions, 7 deletions
diff --git a/drape_frontend/user_event_stream.cpp b/drape_frontend/user_event_stream.cpp index d8c25f1dda..4f7aa29f25 100644 --- a/drape_frontend/user_event_stream.cpp +++ b/drape_frontend/user_event_stream.cpp @@ -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(); } diff --git a/drape_frontend/user_event_stream.hpp b/drape_frontend/user_event_stream.hpp index 98d2fc482c..c7e7598ea7 100644 --- a/drape_frontend/user_event_stream.hpp +++ b/drape_frontend/user_event_stream.hpp @@ -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); |