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 2017-01-02 08:58:11 +01:00
commit 8831916dcd
1 changed files with 8 additions and 8 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

@ -111,13 +111,13 @@ public class MultiTouchSupport {
angleStarted = angle; angleStarted = angle;
inZoomMode = true; inZoomMode = true;
return true; return true;
// End only on second-last pointer up, see above // End only on second-last pointer up, see above?
//} 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){
// Keep zoom center fixed or flexible // Keep zoom center fixed or flexible
centerPoint = new PointF((x1 + x2) / 2, (y1 + y2) / 2); centerPoint = new PointF((x1 + x2) / 2, (y1 + y2) / 2);
@ -132,7 +132,7 @@ public class MultiTouchSupport {
} catch (Exception e) { } catch (Exception e) {
log.debug("Multi touch exception" , e); //$NON-NLS-1$ log.debug("Multi touch exception" , e); //$NON-NLS-1$
} }
return true; return false;
} }
public PointF getCenterPoint() { public PointF getCenterPoint() {