xiaoyan159/vtm
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Two finger tap zoom out gesture, fix #423

Browse Source
This commit is contained in:
Emux
2017-10-04 15:43:01 +03:00
parent 1d7ece5a65
commit a06ea5492e
2 changed files with 14 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
vtm/src/org/oscim/layers/MapEventLayer.java
View File

@@ -1,6 +1,6 @@
/*
* Copyright 2013 Hannes Janetzek
* Copyright 2016 devemux86
* Copyright 2016-2017 devemux86
* Copyright 2016 Andrey Novikov
* Copyright 2016 Longri
*
@@ -59,6 +59,7 @@ public class MapEventLayer extends AbstractMapEventLayer implements InputListene
private boolean mDown;
private boolean mDoubleTap;
private boolean mDragZoom;
private boolean mTwoFingersDone;
private float mPrevX1;
private float mPrevY1;
@@ -157,6 +158,7 @@ public class MapEventLayer extends AbstractMapEventLayer implements InputListene
mStartMove = -1;
mDoubleTap = false;
mDragZoom = false;
mTwoFingersDone = false;
mPrevX1 = e.getX(0);
mPrevY1 = e.getY(0);
@@ -211,6 +213,11 @@ public class MapEventLayer extends AbstractMapEventLayer implements InputListene
return true;
}
if (action == MotionEvent.ACTION_POINTER_UP) {
if (e.getPointerCount() == 2 && !mTwoFingersDone) {
if (!mMap.handleGesture(Gesture.TWO_FINGER_TAP, e)) {
mMap.animator().animateZoom(300, 0.5, 0f, 0f);
}
}
updateMulti(e);
return true;
}
@@ -306,6 +313,7 @@ public class MapEventLayer extends AbstractMapEventLayer implements InputListene
mCanScale = false;
mCanRotate = false;
mDoTilt = true;
mTwoFingersDone = true;
}
}
}
@@ -332,6 +340,7 @@ public class MapEventLayer extends AbstractMapEventLayer implements InputListene
/* start rotate, disable tilt */
mDoRotate = true;
mCanTilt = false;
mTwoFingersDone = true;
mAngle = rad;
} else if (!mDoScale) {
@@ -351,6 +360,7 @@ public class MapEventLayer extends AbstractMapEventLayer implements InputListene
mDoRotate = true;
mCanRotate = true;
mAngle = rad;
mTwoFingersDone = true;
}
}
@@ -366,6 +376,7 @@ public class MapEventLayer extends AbstractMapEventLayer implements InputListene
mCanTilt = false;
mDoScale = true;
mTwoFingersDone = true;
}
}
if (mDoScale || mDoRotate) {