1
0
mirror of https://github.com/ppy/osu.git synced 2024-12-14 10:12:54 +08:00

Only use positional input from most recent touch

This commit is contained in:
Dean Herbert 2023-01-16 21:07:28 +09:00
parent 6b16d3ee61
commit b3860c6d52

View File

@ -51,24 +51,26 @@ namespace osu.Game.Rulesets.Osu.UI
? OsuAction.RightButton
: OsuAction.LeftButton;
// Ignore any taps which trigger an action which is already handled. But track them for potential positional input in the future.
bool shouldResultInAction = !mouseDisabled.Value && trackedTouches.All(t => t.Action != action);
trackedTouches.Add(new TrackedTouch(e.Touch, shouldResultInAction ? action : null));
// Important to update position before triggering the pressed action.
handleTouchMovement(e);
if (!mouseDisabled.Value && trackedTouches.All(t => t.Action != action))
{
trackedTouches.Add(new TrackedTouch(e.Touch, action));
if (shouldResultInAction)
osuInputManager.KeyBindingContainer.TriggerPressed(action);
}
else
{
// Ignore any taps which trigger an action which is already handled. But track them for potential positional input in the future.
trackedTouches.Add(new TrackedTouch(e.Touch, null));
}
return true;
}
private void handleTouchMovement(TouchEvent touchEvent)
{
// Movement should only be tracked for the most recent touch.
if (touchEvent.Touch != trackedTouches.Last().Touch)
return;
new MousePositionAbsoluteInput { Position = touchEvent.ScreenSpaceTouch.Position }.Apply(osuInputManager.CurrentState, osuInputManager);
}