Relintai/sdl2_frt
1
0
Fork 0
mirror of https://github.com/Relintai/sdl2_frt.git synced 2024-12-29 20:27:12 +01:00
Code Issues Packages Projects Releases Wiki Activity

Android: remove duplicate code in SDLGenericMotionListener_API24

Browse Source 
and use parent method
This commit is contained in:
Sylvain Becker 2019-01-17 16:30:19 +01:00
parent 55838d8bd6
commit 9d10c73853
1 changed files with 13 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
android-project/app/src/main/java/org/libsdl/app/SDLControllerManager.java
View File

@ -620,51 +620,24 @@ class SDLGenericMotionListener_API24 extends SDLGenericMotionListener_API12 {
@Override @Override
public boolean onGenericMotion(View v, MotionEvent event) { public boolean onGenericMotion(View v, MotionEvent event) {
float x, y;
int action;
switch ( event.getSource() ) { // Handle relative mouse mode
case InputDevice.SOURCE_JOYSTICK:
case InputDevice.SOURCE_GAMEPAD:
case InputDevice.SOURCE_DPAD:
return SDLControllerManager.handleJoystickMotionEvent(event);
case InputDevice.SOURCE_MOUSE:
if (!SDLActivity.mSeparateMouseAndTouch) {
break;
}
action = event.getActionMasked();
switch (action) {
case MotionEvent.ACTION_SCROLL:
x = event.getAxisValue(MotionEvent.AXIS_HSCROLL, 0);
y = event.getAxisValue(MotionEvent.AXIS_VSCROLL, 0);
SDLActivity.onNativeMouse(0, action, x, y, false);
return true;
case MotionEvent.ACTION_HOVER_MOVE:
if (mRelativeModeEnabled) { if (mRelativeModeEnabled) {
x = event.getAxisValue(MotionEvent.AXIS_RELATIVE_X); if (event.getSource() == InputDevice.SOURCE_MOUSE) {
y = event.getAxisValue(MotionEvent.AXIS_RELATIVE_Y); if (SDLActivity.mSeparateMouseAndTouch) {
} int action = event.getActionMasked();
else { if (action == MotionEvent.ACTION_HOVER_MOVE) {
x = event.getX(0); float x = event.getAxisValue(MotionEvent.AXIS_RELATIVE_X);
y = event.getY(0); float y = event.getAxisValue(MotionEvent.AXIS_RELATIVE_Y);
} SDLActivity.onNativeMouse(0, action, x, y, true);
SDLActivity.onNativeMouse(0, action, x, y, mRelativeModeEnabled);
return true; return true;
default:
break;
} }
break; }
}
default:
break;
} }
// Event was not managed // Event was not managed, call SDLGenericMotionListener_API12 method
return false; return super.onGenericMotion(v, event);
} }
@Override @Override