miguel.horta/commandergenius
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix for nasty bug in multitouch events code

Browse Source
This commit is contained in:
pelya
2012-06-12 14:06:24 +03:00
parent 88e9606d95
commit 90211ac16e
3 changed files with 19 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
project/java/MainActivity.java
View File

@@ -437,6 +437,7 @@ public class MainActivity extends Activity {
@Override
public boolean dispatchTouchEvent(final MotionEvent ev)
{
//System.out.println("dispatchTouchEvent: " + ev.getAction() + " coords " + ev.getX() + ":" + ev.getY() );
if(_screenKeyboard != null)
_screenKeyboard.dispatchTouchEvent(ev);
else
@@ -454,6 +455,7 @@ public class MainActivity extends Activity {
@Override
public boolean dispatchGenericMotionEvent (MotionEvent ev)
{
//System.out.println("dispatchGenericMotionEvent: " + ev.getAction() + " coords " + ev.getX() + ":" + ev.getY() );
// This code fails to run for Android 1.6, so there will be no generic motion event for Andorid screen keyboard
/*
if(_screenKeyboard != null)

20
project/java/Video.java
View File

@@ -106,7 +106,7 @@ abstract class DifferentTouchInput
}
try {
if( android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.GINGERBREAD )
return XperiaMiniTouchpadTouchInput.Holder.sInstance;
return XperiaPlayTouchpadTouchInput.Holder.sInstance;
if (multiTouchAvailable1 && multiTouchAvailable2)
return MultiTouchInput.Holder.sInstance;
else
@@ -228,6 +228,9 @@ abstract class DifferentTouchInput
}
System.out.println(s);
*/
int pointerReleased = -1;
if( (event.getAction() & MotionEvent.ACTION_MASK) == MotionEvent.ACTION_POINTER_UP )
pointerReleased = (event.getAction() & MotionEvent.ACTION_POINTER_INDEX_MASK) >> MotionEvent.ACTION_POINTER_INDEX_SHIFT;
for( int id = 0; id < TOUCH_EVENTS_MAX; id++ )
{
@@ -249,8 +252,15 @@ abstract class DifferentTouchInput
}
else
{
if( touchEvents[id].down )
if( pointerReleased == id && touchEvents[pointerReleased].down )
{
action = Mouse.SDL_FINGER_UP;
touchEvents[id].down = false;
}
else if( touchEvents[id].down )
{
action = Mouse.SDL_FINGER_MOVE;
}
else
{
action = Mouse.SDL_FINGER_DOWN;
@@ -286,11 +296,11 @@ abstract class DifferentTouchInput
}
}
}
private static class XperiaMiniTouchpadTouchInput extends MultiTouchInput
private static class XperiaPlayTouchpadTouchInput extends MultiTouchInput
{
private static class Holder
{
private static final XperiaMiniTouchpadTouchInput sInstance = new XperiaMiniTouchpadTouchInput();
private static final XperiaPlayTouchpadTouchInput sInstance = new XperiaPlayTouchpadTouchInput();
}
float xmin = 0.0f;
@@ -299,7 +309,7 @@ abstract class DifferentTouchInput
float ymax = 1.0f;
float minRange = 1.0f;
XperiaMiniTouchpadTouchInput()
XperiaPlayTouchpadTouchInput()
{
super();
int[] devIds = InputDevice.getDeviceIds();