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

[iOS] Now recognisers work if user after scaling starts draging

Browse source
This commit is contained in:
Kirill Zhdanovich 2013-03-01 15:48:17 +03:00 • committed by Alex Zolotarev
parent c68e1b3ad3
commit 2f22518cdd
1 changed files with 16 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -593,16 +593,27 @@
{
if (recognizer.state == UIGestureRecognizerStateChanged)
{
if (startedScaling)
{
f.StopScale(ScaleEvent(p1.x, p1.y, p2.x, p2.y));
startedScaling = NO;
}
if (startedScaling)
{
f.StopScale(ScaleEvent(p1.x, p1.y, p2.x, p2.y));
CGPoint z = [self pointFromRecognizerWithScaleFactor:recognizer];
f.StartDrag(DragEvent(z.x, z.y));
startedScaling = NO;
lastRotateTime = 0;
}
else
{
[self handlePan:(UIPanGestureRecognizer *)recognizer];
}
}
if (recognizer.state != UIGestureRecognizerStateEnded)
{
return;
}
else if (!startedScaling)
{
[self handlePan:(UIPanGestureRecognizer *)recognizer];
}
}
//Work of Scale Recognizer