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

make start of move gesture dependent on dpi

Browse Source
This commit is contained in:
Hannes Janetzek 2014-01-28 02:23:55 +01:00
parent 0bc0d59446
commit 0198f3d6af
1 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -16,6 +16,7 @@
*/ */
package org.oscim.layers; package org.oscim.layers;
import org.oscim.backend.CanvasAdapter;
import org.oscim.core.Tile; import org.oscim.core.Tile;
import org.oscim.event.Gesture; import org.oscim.event.Gesture;
import org.oscim.event.GestureListener; import org.oscim.event.GestureListener;
@ -67,7 +68,10 @@ public class MapEventLayer extends Layer implements Map.InputListener, GestureLi
protected static final double PINCH_ROTATE_THRESHOLD = 0.02; protected static final double PINCH_ROTATE_THRESHOLD = 0.02;
protected static final float PINCH_TILT_THRESHOLD = 1f; protected static final float PINCH_TILT_THRESHOLD = 1f;
/** ms since start of move to reduce fling scroll */ /** 1mm as minimal distance to start move: dpi / 2.54 */
protected static final float MIN_SLOP = 25.4f;
/** 100 ms since start of move to reduce fling scroll */
protected static final float FLING_THREHSHOLD = 100; protected static final float FLING_THREHSHOLD = 100;
private final Viewport mMapPosition; private final Viewport mMapPosition;
@ -147,9 +151,8 @@ public class MapEventLayer extends Layer implements Map.InputListener, GestureLi
// reduce velocity for short moves // reduce velocity for short moves
float tx = e.getTime() - mStartMove; float tx = e.getTime() - mStartMove;
if (tx < FLING_THREHSHOLD) { if (tx < FLING_THREHSHOLD) {
float s = tx / FLING_THREHSHOLD; vx *= tx / FLING_THREHSHOLD;
vx = vx * (s * s); vy *= tx / FLING_THREHSHOLD;
vy = vy * (s * s);
} }
doFling(vx, vy); doFling(vx, vy);
return true; return true;
@ -204,7 +207,8 @@ public class MapEventLayer extends Layer implements Map.InputListener, GestureLi
return true; return true;
if (mStartMove < 0) { if (mStartMove < 0) {
if (FastMath.withinSquaredDist(mx, my, 100)) { float minSlop = (CanvasAdapter.dpi / MIN_SLOP);
if (FastMath.withinSquaredDist(mx, my, minSlop * minSlop)) {
mPrevX -= mx; mPrevX -= mx;
mPrevY -= my; mPrevY -= my;
return true; return true;