diff options
author | r.kuznetsov <r.kuznetsov@corp.mail.ru> | 2016-05-23 11:15:26 +0300 |
---|---|---|
committer | r.kuznetsov <r.kuznetsov@corp.mail.ru> | 2016-05-23 13:06:38 +0300 |
commit | f657b981dcf1e3274a2336982b6c41531f6756b0 (patch) | |
tree | ade93d9cfa67b5f2b4ce67e8526abf9e07cfaccc /map | |
parent | 35a30d39b7285413dffb8627afa3142aadcd1825 (diff) |
Added closing place page on return to the route
Diffstat (limited to 'map')
-rw-r--r-- | map/framework.cpp | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/map/framework.cpp b/map/framework.cpp index 6fd5d15eb4..59313d2b70 100644 --- a/map/framework.cpp +++ b/map/framework.cpp @@ -227,7 +227,8 @@ void Framework::OnUserPositionChanged(m2::PointD const & position) void Framework::OnViewportChanged(ScreenBase const & screen) { - if (!screen.GlobalRect().EqualDxDy(m_currentModelView.GlobalRect(), 1.0E-4)) + double constexpr kEps = 1.0E-4; + if (!screen.GlobalRect().EqualDxDy(m_currentModelView.GlobalRect(), kEps)) UpdateUserViewportChanged(); m_currentModelView = screen; @@ -1533,6 +1534,10 @@ void Framework::CreateDrapeEngine(ref_ptr<dp::OGLContextFactory> contextFactory, { GetPlatform().RunOnGuiThread([this, mode, routingActive]() { + // Deactivate selection (and hide place page) if we return to routing in F&R mode. + if (routingActive && mode == location::FollowAndRotate) + DeactivateMapSelection(true /* notifyUI */); + if (m_myPositionListener != nullptr) m_myPositionListener(mode, routingActive); }); |