aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRami Santina <[email protected]>2011-08-05 12:35:10 +0300
committerRami Santina <[email protected]>2011-08-05 12:35:10 +0300
commit94d9bcebaa382c87cb4baa6be4b85c8789a140dd (patch)
treebbc32ccbeb3ce7c726c3655ac9efaf20e0e1c708
parentf0e35817ba6a9f9fdc38811de6b29ed1b2eacbbc (diff)
Fix: event mapping mismatch
-rw-r--r--src/newt/classes/com/jogamp/newt/event/MouseEvent.java5
-rw-r--r--src/newt/classes/jogamp/newt/egl/android/event/AndroidNewtEventFactory.java4
2 files changed, 3 insertions, 6 deletions
diff --git a/src/newt/classes/com/jogamp/newt/event/MouseEvent.java b/src/newt/classes/com/jogamp/newt/event/MouseEvent.java
index be763b48d..62a8941d7 100644
--- a/src/newt/classes/com/jogamp/newt/event/MouseEvent.java
+++ b/src/newt/classes/com/jogamp/newt/event/MouseEvent.java
@@ -83,10 +83,6 @@ public class MouseEvent extends InputEvent
return x.length;
}
- public int getPointerId() {
- return pointerids[0];
- }
-
/**
* @return the pointer id for the data at index.
* return -1 if index not available.
@@ -100,6 +96,7 @@ public class MouseEvent extends InputEvent
public int getButton() {
return button;
}
+
public int getClickCount() {
return clickCount;
}
diff --git a/src/newt/classes/jogamp/newt/egl/android/event/AndroidNewtEventFactory.java b/src/newt/classes/jogamp/newt/egl/android/event/AndroidNewtEventFactory.java
index 52e63a215..3619558f8 100644
--- a/src/newt/classes/jogamp/newt/egl/android/event/AndroidNewtEventFactory.java
+++ b/src/newt/classes/jogamp/newt/egl/android/event/AndroidNewtEventFactory.java
@@ -48,8 +48,8 @@ class AndroidNewtEventFactory {
map.put(android.view.MotionEvent.ACTION_MOVE, com.jogamp.newt.event.MouseEvent.EVENT_MOUSE_DRAGGED);
map.put(android.view.MotionEvent.ACTION_OUTSIDE, com.jogamp.newt.event.MouseEvent.EVENT_MOUSE_MOVED);
- map.put(android.view.MotionEvent.ACTION_POINTER_DOWN, com.jogamp.newt.event.MouseEvent.EVENT_MOUSE_RELEASED);
- map.put(android.view.MotionEvent.ACTION_POINTER_UP, com.jogamp.newt.event.MouseEvent.EVENT_MOUSE_PRESSED);
+ map.put(android.view.MotionEvent.ACTION_POINTER_DOWN, com.jogamp.newt.event.MouseEvent.EVENT_MOUSE_PRESSED);
+ map.put(android.view.MotionEvent.ACTION_POINTER_UP, com.jogamp.newt.event.MouseEvent.EVENT_MOUSE_RELEASED);
map.put(android.view.accessibility.AccessibilityEvent.TYPE_VIEW_FOCUSED, com.jogamp.newt.event.WindowEvent.EVENT_WINDOW_GAINED_FOCUS);