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

[iOS] Fix popover's position for new bookmarks

Browse source
This commit is contained in:
Kirill Zhdanovich 2013-05-02 21:28:41 +03:00 • committed by Alex Zolotarev
parent 1eddbc3aff
commit 54fcd34b43
1 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
iphone/Maps/Classes/MapViewController.mm
View file

@ -264,13 +264,6 @@ const long long LITE_IDL = 431183278L;
}
else
{
Framework & f = GetFramework();
if (!IsValid(m_balloonView.editedBookmark))
{
int categoryPos = f.LastEditedCategory();
[m_balloonView addBookmarkToCategory:categoryPos];
}
PlacePageVC * placePageVC = nil;
if (UI_USER_INTERFACE_IDIOM() == UIUserInterfaceIdiomPad)
{
@ -290,6 +283,12 @@ const long long LITE_IDL = 431183278L;
placePageVC = [[PlacePageVC alloc] initWithBalloonView:m_balloonView];
[self.navigationController pushViewController:placePageVC animated:YES];
}
Framework & f = GetFramework();
if (!IsValid(m_balloonView.editedBookmark))
{
int categoryPos = f.LastEditedCategory();
[m_balloonView addBookmarkToCategory:categoryPos];
}
[m_balloonView hide];
[placePageVC release];
}
@ -887,7 +886,8 @@ NSInteger compareAddress(id l, id r, void * context)
-(void)showPopoverFromBalloonData
{
m2::PointD pt = GetFramework().GtoP(m2::PointD(m_balloonView.globalPosition.x, m_balloonView.globalPosition.y));
pt.y -= m_balloonView.pinImage.frame.size.height;
if (IsValid(m_balloonView.editedBookmark))
pt.y -= m_balloonView.pinImage.frame.size.height;
//TODO We should always remember about scale factor, solve this problem
double sf = self.view.contentScaleFactor;
pt.x /= sf;