|
@@ -108,8 +108,8 @@ void Android_OnTouch(int touch_device_id_in, int pointer_finger_id_in, int actio
|
|
|
switch (action) {
|
|
|
case ACTION_DOWN:
|
|
|
/* Primary pointer down */
|
|
|
- Android_GetWindowCoordinates(x, y, &window_x, &window_y);
|
|
|
if (!separate_mouse_and_touch) {
|
|
|
+ Android_GetWindowCoordinates(x, y, &window_x, &window_y);
|
|
|
/* send moved event */
|
|
|
SDL_SendMouseMotion(Android_Window, SDL_TOUCH_MOUSEID, 0, window_x, window_y);
|
|
|
/* send mouse down event */
|
|
@@ -123,8 +123,8 @@ void Android_OnTouch(int touch_device_id_in, int pointer_finger_id_in, int actio
|
|
|
|
|
|
case ACTION_MOVE:
|
|
|
if (!pointerFingerID) {
|
|
|
- Android_GetWindowCoordinates(x, y, &window_x, &window_y);
|
|
|
if (!separate_mouse_and_touch) {
|
|
|
+ Android_GetWindowCoordinates(x, y, &window_x, &window_y);
|
|
|
/* send moved event */
|
|
|
SDL_SendMouseMotion(Android_Window, SDL_TOUCH_MOUSEID, 0, window_x, window_y);
|
|
|
}
|
|
@@ -136,9 +136,9 @@ void Android_OnTouch(int touch_device_id_in, int pointer_finger_id_in, int actio
|
|
|
/* Primary pointer up */
|
|
|
if (!separate_mouse_and_touch) {
|
|
|
/* send mouse up */
|
|
|
- pointerFingerID = (SDL_FingerID) 0;
|
|
|
SDL_SendMouseButton(Android_Window, SDL_TOUCH_MOUSEID, SDL_RELEASED, SDL_BUTTON_LEFT);
|
|
|
}
|
|
|
+ pointerFingerID = (SDL_FingerID) 0;
|
|
|
case ACTION_POINTER_UP:
|
|
|
/* Non primary pointer up */
|
|
|
SDL_SendTouch(touchDeviceId, fingerId, SDL_FALSE, x, y, p);
|