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

IOS7: Cancel pending button if touch is moved within 250 ms

Browse Source 
If not in "click-and-drag" mode, left mouse button down and up
events are sent on touches ended if the touch lasted less than
250 ms. If the touch lasted longer it was considered as a move
and no button events are sent.

This commit mimic that behaviour in touchpad mode when "click-
and-drag" mode is enabled. The left mouse button down event is
queued for 250 ms. If the touch is dragged within 250 ms it is
considered as a move and the queued mouse button down event is
cacelled. If no movement is made withing 250 ms the queued
mouse button event is processed.
This commit is contained in:
Lars Sundström 2023-06-18 23:07:06 +02:00
parent b324c70748
commit 598bc231ab
1 changed files with 22 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
backends/platform/ios7/ios7_osys_events.cpp
View File

@ -192,8 +192,14 @@ bool OSystem_iOS7::handleEvent_touchFirstDown(Common::Event &event, int x, int y
}
if (_mouseClickAndDragEnabled) {
event.type = Common::EVENT_LBUTTONDOWN;
handleEvent_mouseEvent(event, 0, 0);
if (_touchpadModeEnabled) {
_queuedInputEvent.type = Common::EVENT_LBUTTONDOWN;
_queuedEventTime = getMillis() + 250;
handleEvent_mouseEvent(_queuedInputEvent, 0, 0);
} else {
event.type = Common::EVENT_LBUTTONDOWN;
handleEvent_mouseEvent(event, 0, 0);
}
return true;
} else {
_lastMouseDown = getMillis();
@ -209,8 +215,16 @@ bool OSystem_iOS7::handleEvent_touchFirstUp(Common::Event &event, int x, int y)
if (!handleEvent_touchSecondUp(event, x, y))
return false;
} else if (_mouseClickAndDragEnabled) {
event.type = Common::EVENT_LBUTTONUP;
handleEvent_mouseEvent(event, 0, 0);
if (_touchpadModeEnabled && _queuedInputEvent.type == Common::EVENT_LBUTTONDOWN) {
// This has not been sent yet, send it right away
event = _queuedInputEvent;
_queuedInputEvent.type = Common::EVENT_LBUTTONUP;
_queuedEventTime = getMillis() + kQueuedInputEventDelay;
handleEvent_mouseEvent(_queuedInputEvent, 0, 0);
} else {
event.type = Common::EVENT_LBUTTONUP;
handleEvent_mouseEvent(event, 0, 0);
}
} else {
if (getMillis() - _lastMouseDown < 250) {
event.type = Common::EVENT_LBUTTONDOWN;
@ -286,6 +300,10 @@ bool OSystem_iOS7::handleEvent_touchFirstDragged(Common::Event &event, int x, in
_lastPadY = y;
if (_touchpadModeEnabled) {
if (_mouseClickAndDragEnabled && _queuedInputEvent.type == Common::EVENT_LBUTTONDOWN) {
// Cancel the button down event since this was a pure mouse move
_queuedInputEvent.type = Common::EVENT_INVALID;
}
handleEvent_mouseDelta(event, deltaX, deltaY);
} else {
// Update mouse position