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

Merge pull request #2447 from darina/resize-in-follow-and-rotate-fixed

Browse source 
Scale changing after resize in follow and rotate mode on Android fixed.
This commit is contained in:
Roman Kuznetsov 2016-03-23 18:29:18 +03:00
commit 6f1c5316b5
1 changed files with 7 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
drape_frontend/user_event_stream.cpp
View file

@ -138,12 +138,13 @@ ScreenBase const & UserEventStream::ProcessEvents(bool & modelViewChange, bool &
}
modelViewChange = !events.empty() || m_state == STATE_SCALE || m_state == STATE_DRAG;
bool breakAnim = false;
for (UserEvent const & e : events)
{
if (m_perspectiveAnimation != nullptr && FilterEventWhile3dAnimation(e.m_type))
continue;
bool breakAnim = false;
switch (e.m_type)
{
case UserEvent::EVENT_SCALE:
@ -232,12 +233,12 @@ ScreenBase const & UserEventStream::ProcessEvents(bool & modelViewChange, bool &
ASSERT(false, ());
break;
}
}
if (breakAnim)
{
m_animation.reset();
modelViewChange = true;
if (breakAnim)
{
m_animation.reset();
modelViewChange = true;
}
}
if (m_animation != nullptr)