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

Formatting:

Browse source 
Signed-off-by: Colin Takushi <takushicolin@gmail.com>
This commit is contained in:
Colin Takushi 2025-01-26 17:24:20 -06:00
parent eab8564533
commit baca976cce
1 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
drape_frontend/navigator.cpp
View file

@ -193,12 +193,13 @@ bool Navigator::ScaleImpl(m2::PointD const & newPt1, m2::PointD const & newPt2,
if (CanShrinkInto(tmp, worldR))
tmp = ShrinkInto(tmp, worldR);
else
return false;
return false;
}
if (!CheckMaxScale(tmp))
{
if (doRotateScreen){
if (doRotateScreen)
{
math::Matrix<double, 3, 3> const tmpM =
screen.GtoPMatrix() * ScreenBase::CalcTransform(oldPt1 + offset, oldPt2 + offset,
newPt1 + offset, newPt2 + offset,
@ -207,8 +208,10 @@ bool Navigator::ScaleImpl(m2::PointD const & newPt1, m2::PointD const & newPt2,
tmp.SetGtoPMatrix(tmpM);
}
else
{
return false;
}
}
// re-checking the borders, as we might violate them a bit (don't know why).