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

[core] review fixes

Browse source
This commit is contained in:
ExMix 2013-09-26 13:55:43 +03:00 • committed by Alex Zolotarev
parent b4f2bc667e
commit a43aff1f95
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
map/bookmark_balloon.cpp
View file

@ -115,11 +115,11 @@ bool BookmarkBalloon::checkPosition()
bool result = false;
ScreenBase const & screen = m_framework->GetNavigator().Screen();
m2::PointD pixelPivotAtCurrentScreen = screen.GtoP(glbPivot());
// we devide pixel rect on 4 parts and estimate in wich part of screen hit pixel pivot of ballon
m2::PointD pxPivot= screen.GtoP(glbPivot());
// we divide pixel rect on 4 parts and estimate in wich part of screen hit pixel pivot of ballon
// partIndex indicate number of part [0 : 3] from left to right
int partIndex = pixelPivotAtCurrentScreen.x / (screen.PixelRect().SizeX() / 4.0);
ASSERT(partIndex >= 0 && partIndex < 4, ("We check position only on firt show and pivot need to be on screen"));
int partIndex = pxPivot.x / (screen.PixelRect().SizeX() / 4.0);
// if partIndex not in [0 : 3] then ballon pivot in offscreen. In This case we stay position = EPosCenter
graphics::EPosition newPosition = graphics::EPosCenter;
if (partIndex == 0)
@ -138,7 +138,7 @@ bool BookmarkBalloon::checkPosition()
m2::PointD pixelOrg = screen.GtoP(globalOrg);
double k = visualScale();
m2::RectD balloonRect = roughBoundRect();
m2::RectD const & balloonRect = roughBoundRect();
if (balloonRect.minX() < 0)
{
pixelOrg.x += (balloonRect.minX() - AnimPadding * k);