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

[drape] check max scale on rect setting in navigator

Browse source
This commit is contained in:
ExMix 2015-06-15 19:28:54 +03:00 • committed by r.kuznetsov
parent c1ec502bf8
commit 8b04f6078f
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/navigator.cpp
View file

@ -53,14 +53,15 @@ void Navigator::SetFromRect(m2::AnyRectD const & r)
{
m2::RectD const & worldR = df::GetWorldRect();
m_Screen.SetFromRect(r);
m_Screen = ScaleInto(m_Screen, worldR);
ScreenBase tmp = m_Screen;
tmp.SetFromRect(r);
tmp = ScaleInto(tmp, worldR);
if (CheckMaxScale(tmp))
m_Screen = tmp;
if (!m_InAction)
{
m_StartScreen.SetFromRect(r);
m_StartScreen = ScaleInto(m_StartScreen, worldR);
}
m_StartScreen = tmp;
}
void Navigator::CenterViewport(m2::PointD const & p)