Replace ManiaTouchInputArea with touchable columns

Author: frenzibyte

osu.Game.Rulesets.Mania.Tests/TestSceneManiaTouchInputArea.cs

@@ -3,47 +3,38 @@
 
 using System.Linq;
 using NUnit.Framework;
-using osu.Framework.Graphics.Containers;
 using osu.Framework.Input;
 using osu.Framework.Testing;
 using osu.Game.Rulesets.Mania.UI;
 using osu.Game.Tests.Visual;
 
 namespace osu.Game.Rulesets.Mania.Tests
 {
-    public partial class TestSceneManiaTouchInputArea : PlayerTestScene
+    public partial class TestSceneManiaTouchInput : PlayerTestScene
     {
         protected override Ruleset CreatePlayerRuleset() => new ManiaRuleset();
 
         [Test]
-        public void TestTouchAreaNotInitiallyVisible()
+        public void TestPressColumns()
         {
-            AddAssert("touch area not visible", () => getTouchOverlay()?.State.Value == Visibility.Hidden);
-        }
-
-        [Test]
-        public void TestPressReceptors()
-        {
-            AddAssert("touch area not visible", () => getTouchOverlay()?.State.Value == Visibility.Hidden);
-
             for (int i = 0; i < 4; i++)
             {
                 int index = i;
 
-                AddStep($"touch receptor {index}", () => InputManager.BeginTouch(new Touch(TouchSource.Touch1, getReceptor(index).ScreenSpaceDrawQuad.Centre)));
+                AddStep($"touch column {index}", () => InputManager.BeginTouch(new Touch(TouchSource.Touch1, getColumn(index).ScreenSpaceDrawQuad.Centre)));
 
                 AddAssert("action sent",
                     () => this.ChildrenOfType<ManiaInputManager>().SelectMany(m => m.KeyBindingContainer.PressedActions),
-                    () => Does.Contain(getReceptor(index).Action.Value));
+                    () => Does.Contain(getColumn(index).Action.Value));
 
-                AddStep($"release receptor {index}", () => InputManager.EndTouch(new Touch(TouchSource.Touch1, getReceptor(index).ScreenSpaceDrawQuad.Centre)));
+                AddStep($"release receptor {index}", () => InputManager.EndTouch(new Touch(TouchSource.Touch1, getColumn(index).ScreenSpaceDrawQuad.Centre)));
 
-                AddAssert("touch area visible", () => getTouchOverlay()?.State.Value == Visibility.Visible);
+                AddAssert("action released",
+                    () => this.ChildrenOfType<ManiaInputManager>().SelectMany(m => m.KeyBindingContainer.PressedActions),
+                    () => Does.Not.Contain(getColumn(index).Action.Value));
             }
         }
 
-        private ManiaTouchInputArea? getTouchOverlay() => this.ChildrenOfType<ManiaTouchInputArea>().SingleOrDefault();
-
-        private ManiaTouchInputArea.ColumnInputReceptor getReceptor(int index) => this.ChildrenOfType<ManiaTouchInputArea.ColumnInputReceptor>().ElementAt(index);
+        private Column getColumn(int index) => this.ChildrenOfType<Column>().ElementAt(index);
     }
 }

osu.Game.Rulesets.Mania/UI/Column.cs

@@ -3,6 +3,7 @@
 
 #nullable disable
 
+using JetBrains.Annotations;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Framework.Graphics;
@@ -125,6 +126,21 @@ protected override void LoadComplete()
             NewResult += OnNewResult;
         }
 
+        [Resolved(canBeNull: true)]
+        [CanBeNull]
+        private ManiaInputManager inputManager { get; set; }
+
+        protected override bool OnTouchDown(TouchDownEvent e)
+        {
+            inputManager?.KeyBindingContainer.TriggerPressed(Action.Value);
+            return true;
+        }
+
+        protected override void OnTouchUp(TouchUpEvent e)
+        {
+            inputManager?.KeyBindingContainer.TriggerReleased(Action.Value);
+        }
+
         protected override void Dispose(bool isDisposing)
         {
             // must happen before children are disposed in base call to prevent illegal accesses to the hit explosion pool.

osu.Game.Rulesets.Mania/UI/DrawableManiaRuleset.cs

@@ -112,8 +112,6 @@ private void load(ISkinSource source)
             configScrollSpeed.BindValueChanged(speed => TargetTimeRange = ComputeScrollTime(speed.NewValue));
 
             TimeRange.Value = TargetTimeRange = currentTimeRange = ComputeScrollTime(configScrollSpeed.Value);
-
-            KeyBindingInputManager.Add(new ManiaTouchInputArea());
         }
 
         protected override void AdjustScrollSpeed(int amount) => configScrollSpeed.Value += amount;