organicmaps/organicmaps-tmp
Archived
13
Fork 1
Code Issues 2.7k Pull requests 182 Projects Releases 65 Wiki Activity Actions

Fixed set rect

Browse source
This commit is contained in:
r.kuznetsov 2016-03-25 17:05:32 +03:00
parent e717a3aef7
commit 9d73b39760
1 changed files with 11 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
drape_frontend/navigator.cpp
View file

@ -63,13 +63,19 @@ void Navigator::SetFromRect(m2::AnyRectD const & r, uint32_t tileSize, double vi
tmp.SetFromRect(r);
tmp = ScaleInto(tmp, worldR);
if (CheckMaxScale(tmp, tileSize, visualScale))
if (!CheckMaxScale(tmp, tileSize, visualScale))
{
m_Screen = tmp;
if (!m_InAction)
m_StartScreen = tmp;
int const scale = scales::GetUpperStyleScale() - 1;
m2::RectD newRect = df::GetRectForDrawScale(scale, r.Center());
CheckMinMaxVisibleScale(newRect, scale);
tmp = m_Screen;
tmp.SetFromRect(m2::AnyRectD(newRect));
ASSERT(CheckMaxScale(tmp, tileSize, visualScale), ());
}
m_Screen = tmp;
if (!m_InAction)
m_StartScreen = tmp;
}
void Navigator::CenterViewport(m2::PointD const & p)