Compare commits

...

3 Commits

Author SHA1 Message Date
Cameron Gutman 9638c15c93 I'll take a mulligan on v2.1. Here comes v2.1.1 2014-03-26 01:37:34 -04:00
Cameron Gutman 8ce972ea7a Properly distinguish between keyboard and controller events 2014-03-26 01:36:52 -04:00
Cameron Gutman 968557d3a8 Fix mouse dragging 2014-03-26 01:28:02 -04:00
2 changed files with 6 additions and 4 deletions
+2 -2
View File
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="com.limelight"
android:versionCode="6"
android:versionName="2.1" >
android:versionCode="7"
android:versionName="2.1.1" >
<uses-sdk
android:minSdkVersion="16"
+4 -2
View File
@@ -200,7 +200,7 @@ public class Game extends Activity implements OnGenericMotionListener, OnTouchLi
@Override
public boolean onKeyDown(int keyCode, KeyEvent event) {
if (event.getDevice() != null &&
(event.getDevice().getSources() & InputDevice.SOURCE_KEYBOARD) != 0) {
(event.getDevice().getKeyboardType() == InputDevice.KEYBOARD_TYPE_ALPHABETIC)) {
short translated = keybTranslator.translate(event.getKeyCode());
if (translated == 0) {
return super.onKeyDown(keyCode, event);
@@ -276,7 +276,7 @@ public class Game extends Activity implements OnGenericMotionListener, OnTouchLi
@Override
public boolean onKeyUp(int keyCode, KeyEvent event) {
if (event.getDevice() != null &&
(event.getDevice().getSources() & InputDevice.SOURCE_KEYBOARD) != 0) {
(event.getDevice().getKeyboardType() == InputDevice.KEYBOARD_TYPE_ALPHABETIC)) {
short translated = keybTranslator.translate(event.getKeyCode());
if (translated == 0) {
return super.onKeyUp(keyCode, event);
@@ -446,6 +446,8 @@ public class Game extends Activity implements OnGenericMotionListener, OnTouchLi
}
}
updateMousePosition((int)event.getX(), (int)event.getY());
lastButtonState = event.getButtonState();
}
else