libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-04-10 10:41:41 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

PSP2: Prevent jumping touch cursor on right click

Browse Source
This commit is contained in:
rsn8887 2018-01-28 19:48:54 -06:00
parent 195d1f5dee
commit d80ddcc246
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
backends/events/psp2sdl/psp2sdl-events.cpp
View File

@ -124,10 +124,6 @@ void PSP2EventSource::preprocessFingerUp(SDL_Event *event) {
int x = _km.x / MULTIPLIER; int x = _km.x / MULTIPLIER;
int y = _km.y / MULTIPLIER; int y = _km.y / MULTIPLIER;
if (port == 0) {
convertTouchXYToGameXY(event->tfinger.x, event->tfinger.y, &x, &y);
}
for (int i = 0; i < MAX_NUM_FINGERS; i++) { for (int i = 0; i < MAX_NUM_FINGERS; i++) {
if (_finger[port][i].id == id) { if (_finger[port][i].id == id) {
_finger[port][i].id = -1; _finger[port][i].id = -1;
@ -140,6 +136,9 @@ void PSP2EventSource::preprocessFingerUp(SDL_Event *event) {
simulatedButton = SDL_BUTTON_RIGHT; simulatedButton = SDL_BUTTON_RIGHT;
} else if (numFingersDown == 1) { } else if (numFingersDown == 1) {
simulatedButton = SDL_BUTTON_LEFT; simulatedButton = SDL_BUTTON_LEFT;
if (port == 0) {
convertTouchXYToGameXY(event->tfinger.x, event->tfinger.y, &x, &y);
}
} }
event->type = SDL_MOUSEBUTTONDOWN; event->type = SDL_MOUSEBUTTONDOWN;
@ -157,6 +156,9 @@ void PSP2EventSource::preprocessFingerUp(SDL_Event *event) {
} }
} else if (numFingersDown == 1) { } else if (numFingersDown == 1) {
// when dragging, and the last finger is lifted, the drag is over // when dragging, and the last finger is lifted, the drag is over
if (port == 0) {
convertTouchXYToGameXY(event->tfinger.x, event->tfinger.y, &x, &y);
}
event->type = SDL_MOUSEBUTTONUP; event->type = SDL_MOUSEBUTTONUP;
event->button.button = SDL_BUTTON_LEFT; event->button.button = SDL_BUTTON_LEFT;
event->button.x = x; event->button.x = x;
@ -255,7 +257,7 @@ void PSP2EventSource::preprocessFingerMotion(SDL_Event *event) {
} }
} }
// Check if we are starting a two-finger drag and push mouse button if neccessary // If we are starting a multi-finger drag, start holding down the mouse button
if (numFingersDown >= 2) { if (numFingersDown >= 2) {
if (!_multiFingerDragging[port]) { if (!_multiFingerDragging[port]) {
// only start a multi-finger drag if at least two fingers have been down long enough // only start a multi-finger drag if at least two fingers have been down long enough