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

Fixed follow animation after the start of navigation.

Browse source
This commit is contained in:
Daria Volvenkova 2016-05-06 14:39:17 +03:00 • committed by Vladimir Byko-Ianko
parent b03bc2683b
commit 667532357b
2 changed files with 7 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
drape_frontend/animation_system.cpp
View file

@ -987,7 +987,7 @@ void AnimationSystem::CombineAnimation(drape_ptr<Animation> animation)
{
for (auto & lst : m_animationChain)
{
bool couldBeBlended = true;
bool couldBeBlended = animation->CouldBeBlended();
for (auto it = lst.begin(); it != lst.end();)
{
auto & anim = *it;
@ -1013,12 +1013,17 @@ void AnimationSystem::CombineAnimation(drape_ptr<Animation> animation)
++it;
}
}
if (couldBeBlended)
{
animation->OnStart();
lst.emplace_back(move(animation));
return;
}
else if (m_animationChain.size() > 1 && animation->CouldBeInterrupted())
{
return;
}
}
PushAnimation(move(animation));
}

1
drape_frontend/animation_system.hpp
View file

@ -134,6 +134,7 @@ public:
void SetOnFinishAction(TAction const & action) { m_onFinishAction = action; }
void SetOnInterruptAction(TAction const & action) { m_onInterruptAction = action; }
bool CouldBeBlended() const { return m_couldBeBlended; }
bool CouldBeInterrupted() const { return m_couldBeInterrupted; }
bool CouldBeBlendedWith(Animation const & animation) const;