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

IOS7: Make "touchpad mode" usable again

Browse Source 
"Touchpad mode" is a mode where the mouse cursor is moved based on touch
movements rather on clicks. The problem was that when "touchpad mode"
was enabled it was very hard to click on items because the cursor moved
on every single click.

Make the action occur based on the current pointer position rather on
the touch location  when in "touchpad mode".

Make the movement more intuitive when in "touchpad mode" by calculating
the delta of locations of touches and update the pointerPosition based
on that. That will give a feeling of using a real touchpad where the
location of where the touch occur doesn't matter for the cursor.

This will solve issue #13917
This commit is contained in:
Lars Sundström 2022-11-27 14:59:23 +01:00 committed by Thierry Crozat
parent 1ef11b1725
commit f76cf2195e
1 changed files with 25 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
backends/platform/ios7/ios7_touch_controller.mm
View File

@ -60,14 +60,24 @@
if (allTouches.count == 1) {
_firstTouch = [allTouches anyObject];
if (_firstTouch.type == UITouchTypeDirect) {
// Move the pointer to the new position
[self handlePointerMoveTo:[_firstTouch locationInView: [self view]]];
[self handleMouseButtonAction:kGameControllerMouseButtonLeft isPressed:YES at:[_firstTouch locationInView:[self view]]];
if (iOS7_touchpadModeEnabled()) {
// In touchpad mode the action should occur on the current pointer position
[self handleMouseButtonAction:kGameControllerMouseButtonLeft isPressed:YES at:[[self view] pointerPosition]];
} else {
// Only move the pointer to the new position if not in touchpadMode else it's very hard to click on items
[self handlePointerMoveTo:[_firstTouch locationInView: [self view]]];
[self handleMouseButtonAction:kGameControllerMouseButtonLeft isPressed:YES at:[_firstTouch locationInView:[self view]]];
}
}
} else if (allTouches.count == 2) {
_secondTouch = [self secondTouchOtherTouchThan:_firstTouch in:allTouches];
if (_secondTouch && _secondTouch.type == UITouchTypeDirect) {
[self handleMouseButtonAction:kGameControllerMouseButtonRight isPressed:YES at:[_firstTouch locationInView:[self view]]];
if (iOS7_touchpadModeEnabled()) {
// In touchpad mode the action should occur on the current pointer position
[self handleMouseButtonAction:kGameControllerMouseButtonRight isPressed:YES at:[[self view] pointerPosition]];
} else {
[self handleMouseButtonAction:kGameControllerMouseButtonRight isPressed:YES at:[_secondTouch locationInView:[self view]]];
}
}
}
}
@ -78,7 +88,17 @@
if (touch == _firstTouch ||
touch == _secondTouch) {
if (touch.type == UITouchTypeDirect) {
[self handlePointerMoveTo:[touch locationInView: [self view]]];
if (iOS7_touchpadModeEnabled()) {
// Calculate new position for the pointer based on delta of the current and previous location of the touch
CGPoint pointerLocation = [[self view] pointerPosition];
CGPoint touchLocation = [touch locationInView:[self view]];
CGPoint previousTouchLocation = [touch previousLocationInView:[self view]];
pointerLocation.y += touchLocation.y - previousTouchLocation.y;
pointerLocation.x += touchLocation.x - previousTouchLocation.x;
[self handlePointerMoveTo:pointerLocation];
} else {
[self handlePointerMoveTo:[touch locationInView: [self view]]];
}
}
}
}