kirylkaveryn/organicmaps
1
Fork 0
forked from organicmaps/organicmaps-tmp
Code Pull requests Activity

Added closing place page on return to the route

Browse source
This commit is contained in:
r.kuznetsov 2016-05-23 11:15:26 +03:00
parent 35a30d39b7
commit f657b981dc
1 changed files with 6 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
map/framework.cpp
View file

@ -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);
});