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

back out masking

Browse source
This commit is contained in:
sonora 2017-01-01 19:55:41 +01:00
parent d18247de17
commit a0af664e86
1 changed files with 3 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
OsmAnd/src/net/osmand/plus/views/OsmandMapTileView.java
View file

@ -157,7 +157,7 @@ public class OsmandMapTileView implements IMapDownloaderCallback {
private MultiTouchSupport multiTouchSupport; private MultiTouchSupport multiTouchSupport;
private DoubleTapScaleDetector doubleTapScaleDetector; private DoubleTapScaleDetector doubleTapScaleDetector;
private TwoFingerTapDetector twoFingersTapDetector; private TwoFingerTapDetector twoFingersTapDetector;
private boolean afterTwoFingersTap = false; //private boolean afterTwoFingersTap = false;
private boolean afterDoubleTap = false; private boolean afterDoubleTap = false;
public OsmandMapTileView(MapActivity activity, int w, int h) { public OsmandMapTileView(MapActivity activity, int w, int h) {
@ -218,7 +218,7 @@ public class OsmandMapTileView implements IMapDownloaderCallback {
twoFingersTapDetector = new TwoFingerTapDetector() { twoFingersTapDetector = new TwoFingerTapDetector() {
@Override @Override
public void onTwoFingerTap() { public void onTwoFingerTap() {
afterTwoFingersTap = true; //afterTwoFingersTap = true;
if (isZoomingAllowed(getZoom(), -1.1f)) { if (isZoomingAllowed(getZoom(), -1.1f)) {
getAnimatedDraggingThread().startZooming(getZoom() - 1, currentViewport.getZoomFloatPart(), true); getAnimatedDraggingThread().startZooming(getZoom() - 1, currentViewport.getZoomFloatPart(), true);
} }
@ -1126,10 +1126,9 @@ public class OsmandMapTileView implements IMapDownloaderCallback {
@Override @Override
public boolean onSingleTapConfirmed(MotionEvent e) { public boolean onSingleTapConfirmed(MotionEvent e) {
if (doubleTapScaleDetector.isDoubleTapping() || afterDoubleTap || afterTwoFingersTap) { if (doubleTapScaleDetector.isDoubleTapping() || afterDoubleTap) {
// Needed to suppress false single tap detection if we mask MotionEvents for gestures on isDoubleTapping() // Needed to suppress false single tap detection if we mask MotionEvents for gestures on isDoubleTapping()
afterDoubleTap = false; afterDoubleTap = false;
afterTwoFingersTap = false;
return true; return true;
} }
PointF point = new PointF(e.getX(), e.getY()); PointF point = new PointF(e.getX(), e.getY());