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

Clip screen scale by max valid value.

Browse source
This commit is contained in:
Daria Volvenkova 2018-04-17 19:21:09 +03:00 • committed by Roman Kuznetsov
parent 844feda7e9
commit d091b981a7
1 changed files with 7 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
drape_frontend/screen_operations.cpp
View file

@ -259,7 +259,13 @@ bool ApplyScale(m2::PointD const & pixelScaleCenter, double factor, ScreenBase &
}
if (!CheckMaxScale(tmp))
return false;
{
// Set scale value slightly less than upper bound, to get closest valid zoom.
auto const correctedScale = GetScale((scales::GetUpperStyleScale() + 1) * 0.995);
tmp.SetScale(correctedScale);
if (!CheckMaxScale(tmp))
return false;
}
// re-checking the borders, as we might violate them a bit (don't know why).
if (!CheckBorders(tmp))