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

clean up

Browse source
This commit is contained in:
sonora 2016-12-29 16:07:58 +01:00
parent 9f1bd44df9
commit 347975349a
2 changed files with 8 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -88,7 +88,6 @@ public class MultiTouchSupport {
if(inZoomMode){
listener.onZoomOrRotationEnded(zoomRelative, angleRelative);
inZoomMode = false;
//return true;
}
return false;
}
@ -111,12 +110,13 @@ public class MultiTouchSupport {
angleStarted = angle;
inZoomMode = true;
return true;
} else if(actionCode == ACTION_POINTER_UP){
if(inZoomMode){
listener.onZoomOrRotationEnded(zoomRelative, angleRelative);
inZoomMode = false;
}
return true;
// End only on second-last pointer up, see above
//} else if(actionCode == ACTION_POINTER_UP){
// if(inZoomMode){
// listener.onZoomOrRotationEnded(zoomRelative, angleRelative);
// inZoomMode = false;
// }
// return true;
} else if(inZoomMode && actionCode == MotionEvent.ACTION_MOVE){
if(angleDefined) {
angleRelative = MapUtils.unifyRotationTo360(angle - angleStarted);

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

@ -861,9 +861,8 @@ public class OsmandMapTileView implements IMapDownloaderCallback {
for (int i = layers.size() - 1; i >= 0; i--) {
layers.get(i).onTouchEvent(event, getCurrentRotatedTileBox());
}
// gestureDetector.onTouchEvent(event);
gestureDetector.onTouchEvent(event);
}
gestureDetector.onTouchEvent(event);
return true;
}