kirylkaveryn/organicmaps
1
Fork 0
forked from organicmaps/organicmaps-tmp
Code Pull requests Activity

Revert "[android] Moved touch events to the GUI thread"

Browse source 
This reverts commit 5562877054999d9fca172d57793fed284dcca7be.
This commit is contained in:
rachytski 2012-01-30 19:05:09 +04:00 • committed by Alex Zolotarev
parent f567813ef9
commit 1436e640c7
1 changed files with 17 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

37
android/src/com/mapswithme/maps/SmartGLSurfaceView.java
View file

@ -121,15 +121,15 @@ public class SmartGLSurfaceView extends GLSurfaceView
@Override
public boolean onTouchEvent (MotionEvent event)
{
final float x1, y1, x2, y2;
switch (event.getAction() & MotionEvent.ACTION_MASK)
{
case MotionEvent.ACTION_DOWN:
nativeMove(START_CMD, event.getX(), event.getY());
x1 = event.getX(); y1 = event.getY();
queueEvent(new Runnable() {@Override public void run() {nativeMove(START_CMD, x1, y1);}});
break;
case MotionEvent.ACTION_POINTER_DOWN:
{
final float x1, y1, x2, y2;
if (event.getPointerId(0) < event.getPointerId(1))
{
x1 = event.getX(0); y1 = event.getY(0); x2 = event.getX(1); y2 = event.getY(1);
@ -138,14 +138,12 @@ public class SmartGLSurfaceView extends GLSurfaceView
{
x1 = event.getX(1); y1 = event.getY(1); x2 = event.getX(0); y2 = event.getY(0);
}
nativeZoom(START_CMD, x1, y1, x2, y2);
}
break;
queueEvent(new Runnable() {@Override public void run() {nativeZoom(START_CMD, x1, y1, x2, y2);}});
break;
case MotionEvent.ACTION_MOVE:
if (event.getPointerCount() > 1)
{
final float x1, y1, x2, y2;
if (event.getPointerId(0) < event.getPointerId(1))
{
x1 = event.getX(0); y1 = event.getY(0); x2 = event.getX(1); y2 = event.getY(1);
@ -154,17 +152,16 @@ public class SmartGLSurfaceView extends GLSurfaceView
{
x1 = event.getX(1); y1 = event.getY(1); x2 = event.getX(0); y2 = event.getY(0);
}
nativeZoom(DO_CMD, x1, y1, x2, y2);
queueEvent(new Runnable() {@Override public void run() {nativeZoom(DO_CMD, x1, y1, x2, y2);}});
}
else
{
nativeMove(DO_CMD, event.getX(), event.getY());
x1 = event.getX(); y1 = event.getY();
queueEvent(new Runnable() {@Override public void run() {nativeMove(DO_CMD, x1, y1);}});
}
break;
case MotionEvent.ACTION_POINTER_UP:
{
final float x1, y1, x2, y2;
if (event.getPointerId(0) < event.getPointerId(1))
{
x1 = event.getX(0); y1 = event.getY(0); x2 = event.getX(1); y2 = event.getY(1);
@ -173,21 +170,21 @@ public class SmartGLSurfaceView extends GLSurfaceView
{
x1 = event.getX(1); y1 = event.getY(1); x2 = event.getX(0); y2 = event.getY(0);
}
nativeZoom(STOP_CMD, x1, y1, x2, y2);
queueEvent(new Runnable() {@Override public void run() {nativeZoom(STOP_CMD, x1, y1, x2, y2);}});
final int leftIndex = ((event.getAction() & MotionEvent.ACTION_POINTER_INDEX_MASK)
>> MotionEvent.ACTION_POINTER_ID_SHIFT) == 0 ? 1 : 0;
nativeMove(START_CMD, event.getX(leftIndex), event.getY(leftIndex));
}
break;
final float x = event.getX(leftIndex), y = event.getY(leftIndex);
queueEvent(new Runnable() {@Override public void run() {nativeMove(START_CMD, x, y);}});
break;
case MotionEvent.ACTION_UP:
nativeMove(STOP_CMD, event.getX(), event.getY());
x1 = event.getX(); y1 = event.getY();
queueEvent(new Runnable() {@Override public void run() {nativeMove(STOP_CMD, x1, y1);}});
break;
case MotionEvent.ACTION_CANCEL:
if (event.getPointerCount() > 1)
{
final float x1, y1, x2, y2;
if (event.getPointerId(0) < event.getPointerId(1))
{
x1 = event.getX(0); y1 = event.getY(0); x2 = event.getX(1); y2 = event.getY(1);
@ -196,13 +193,13 @@ public class SmartGLSurfaceView extends GLSurfaceView
{
x1 = event.getX(1); y1 = event.getY(1); x2 = event.getX(0); y2 = event.getY(0);
}
nativeZoom(STOP_CMD, x1, y1, x2, y2);
queueEvent(new Runnable() {@Override public void run() {nativeZoom(STOP_CMD, x1, y1, x2, y2);}});
}
else
{
nativeMove(STOP_CMD, event.getX(), event.getY());
x1 = event.getX(); y1 = event.getY();
queueEvent(new Runnable() {@Override public void run() {nativeMove(STOP_CMD, x1, y1);}});
}
break;
}
requestRender();