From 2986ebe76f64e9e1b993df42fedfd378bbaff669 Mon Sep 17 00:00:00 2001 From: Daria Volvenkova Date: Wed, 23 Mar 2016 17:04:07 +0300 Subject: [PATCH] Scale changing after resize in follow and rotate mode on Android fixed. --- drape_frontend/user_event_stream.cpp | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/drape_frontend/user_event_stream.cpp b/drape_frontend/user_event_stream.cpp index 060836f0d8..5e923752bb 100644 --- a/drape_frontend/user_event_stream.cpp +++ b/drape_frontend/user_event_stream.cpp @@ -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)