Merge pull request #6459 from frenzibyte/fix-touch-hold-toggle

Fix disabling hold-to-right-click not cancelling in-progress actions
ppy · Dec 16, 2024 · 3642268 · 3642268
2 parents aa8e72e + 3300793
commit 3642268
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 0 deletions.
diff --git a/osu.Framework.Tests/Visual/Input/TestSceneTouchInput.cs b/osu.Framework.Tests/Visual/Input/TestSceneTouchInput.cs
@@ -32,6 +32,8 @@ public partial class TestSceneTouchInput : ManualInputManagerTestScene
         [SetUp]
         public new void SetUp() => Schedule(() =>
         {
+            InputManager.RightClickFromLongTouch = true;
+
             Children = new Drawable[]
             {
                 new Container
@@ -606,6 +608,25 @@ public void TestHoldTwoTouchesAndReleaseSecondBeforeRightClick()
             AddAssert("no right click received", () => primaryReceptor.MouseEvents.Count == 0 && secondaryReceptor.MouseEvents.Count == 0);
         }
 
+        [Test]
+        public void TestHoldTouchAndDisableHoldingBeforeRightClick()
+        {
+            InputReceptor primaryReceptor = null;
+
+            AddStep("retrieve primary receptor", () => primaryReceptor = receptors[(int)TouchSource.Touch1]);
+            AddStep("setup handlers to receive mouse-from-touch", () =>
+            {
+                primaryReceptor.HandleTouch = _ => false;
+                primaryReceptor.HandleMouse = e => e is MouseButtonEvent button && button.Button == MouseButton.Right;
+            });
+
+            AddStep("begin touch", () => InputManager.BeginTouch(new Touch(TouchSource.Touch1, getTouchDownPos(TouchSource.Touch1))));
+            AddWaitStep("hold shortly", 2);
+            AddStep("turn off hold-to-right-click", () => InputManager.RightClickFromLongTouch = false);
+            AddWaitStep("wait a bit", 4);
+            AddAssert("no right click received", () => primaryReceptor.MouseEvents.Count == 0);
+        }
+
         private partial class InputReceptor : Container
         {
             public readonly TouchSource AssociatedSource;

diff --git a/osu.Framework/Input/InputManager.cs b/osu.Framework/Input/InputManager.cs
@@ -507,6 +507,9 @@ protected override void Update()
             if (FocusedDrawable == null)
                 focusTopMostRequestingDrawable();
 
+            if (!AllowRightClickFromLongTouch && touchLongPressDelegate != null)
+                cancelTouchLongPress();
+
             base.Update();
         }