diff options
| author | Daria Volvenkova <d.volvenkova@corp.mail.ru> | 2016-07-07 18:46:19 +0300 |
|---|---|---|
| committer | Daria Volvenkova <d.volvenkova@corp.mail.ru> | 2016-07-08 17:24:54 +0300 |
| commit | 6c6ff08f9dd685135cff652c966cabb9dcf99879 (patch) | |
| tree | a5d891af03dc375db040f4e75b8d7de91c30974a /drape_frontend/user_event_stream.cpp | |
| parent | 7ab8f049ed68092129f96de13940afab01adfbf6 (diff) | |
Review fixes.
Diffstat (limited to 'drape_frontend/user_event_stream.cpp')
| -rw-r--r-- | drape_frontend/user_event_stream.cpp | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/drape_frontend/user_event_stream.cpp b/drape_frontend/user_event_stream.cpp index 106bd58023..6ad6f1c6c2 100644 --- a/drape_frontend/user_event_stream.cpp +++ b/drape_frontend/user_event_stream.cpp @@ -413,8 +413,8 @@ bool UserEventStream::SetFollowAndRotate(m2::PointD const & userPos, m2::PointD } screen.MatchGandP3d(userPos, pixelPos); - ASSERT_GREATER_OR_EQUAL(zoom, scales::GetUpperWorldScale(), ()); - ASSERT_LESS_OR_EQUAL(zoom, scales::GetUpperStyleScale(), ()); + ASSERT_GREATER_OR_EQUAL(preferredZoomLevel, scales::GetUpperWorldScale(), ()); + ASSERT_LESS_OR_EQUAL(preferredZoomLevel, scales::GetUpperStyleScale(), ()); ShrinkAndScaleInto(screen, df::GetWorldRect()); @@ -463,7 +463,9 @@ bool UserEventStream::SetFollowAndRotate(m2::PointD const & userPos, m2::PointD void UserEventStream::SetAutoPerspective(bool isAutoPerspective) { - if (!isAutoPerspective) + if (isAutoPerspective) + m_navigator.Enable3dMode(); + else m_navigator.Disable3dMode(); m_navigator.SetAutoPerspective(isAutoPerspective); return; |