Android-builders-club/OsmAnd
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse source
This commit is contained in:
Weblate 2016-12-27 20:14:23 +01:00
commit f98c4e45c1
1 changed files with 9 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
OsmAnd/src/net/osmand/plus/views/MultiTouchSupport.java
View file

@ -88,7 +88,9 @@ public class MultiTouchSupport {
if(pointCount < 2){ if(pointCount < 2){
if(inZoomMode){ if(inZoomMode){
listener.onZoomOrRotationEnded(zoomRelative, angleRelative); listener.onZoomOrRotationEnded(zoomRelative, angleRelative);
inZoomMode = false; if(pointCount == 0){
inZoomMode = false;
}
} }
return false; return false;
} }
@ -111,12 +113,12 @@ public class MultiTouchSupport {
angleStarted = angle; angleStarted = angle;
inZoomMode = true; inZoomMode = true;
return true; return true;
} else if(actionCode == ACTION_POINTER_UP){ //} else if(actionCode == ACTION_POINTER_UP){
if(inZoomMode){ // if(inZoomMode){
listener.onZoomOrRotationEnded(zoomRelative, angleRelative); // listener.onZoomOrRotationEnded(zoomRelative, angleRelative);
inZoomMode = false; // inZoomMode = false;
} // }
return true; // return true;
} else if(inZoomMode && actionCode == MotionEvent.ACTION_MOVE){ } else if(inZoomMode && actionCode == MotionEvent.ACTION_MOVE){
if(angleDefined) { if(angleDefined) {
angleRelative = MapUtils.unifyRotationTo360(angle - angleStarted); angleRelative = MapUtils.unifyRotationTo360(angle - angleStarted);