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

[ios] Now you can not touch popovers when SideToolbar is visible

Browse source
This commit is contained in:
Igor Khmurets 2013-12-05 21:14:15 +03:00 • committed by Alex Zolotarev
parent b6d51fd5ca
commit 872b727545
1 changed files with 12 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -333,6 +333,9 @@ const long long LITE_IDL = 431183278L;
- (void)touchesBegan:(NSSet *)touches withEvent:(UIEvent *)event
{
if (!self.sideToolbar.isMenuHidden)
return;
// To cancel single tap timer
UITouch * theTouch = (UITouch *)[touches anyObject];
if (theTouch.tapCount > 1)
@ -369,6 +372,9 @@ const long long LITE_IDL = 431183278L;
- (void)touchesMoved:(NSSet *)touches withEvent:(UIEvent *)event
{
if (!self.sideToolbar.isMenuHidden)
return;
m2::PointD const TempPt1 = m_Pt1;
m2::PointD const TempPt2 = m_Pt2;
@ -420,6 +426,12 @@ const long long LITE_IDL = 431183278L;
- (void)touchesEnded:(NSSet *)touches withEvent:(UIEvent *)event
{
if (!self.sideToolbar.isMenuHidden)
{
[self.sideToolbar setMenuHidden:YES animated:YES];
return;
}
[self updatePointsFromEvent:event];
[self stopCurrentAction];