Merge pull request #16719 from peppy/mania-column-touch

Add basic touch input support for osu!mania

osu.Game.Rulesets.Mania/ManiaInputManager.cs

@@ -2,11 +2,13 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using System.ComponentModel;
+using osu.Framework.Allocation;
 using osu.Framework.Input.Bindings;
 using osu.Game.Rulesets.UI;
 
 namespace osu.Game.Rulesets.Mania
 {
+    [Cached] // Used for touch input, see ColumnTouchInputArea.
     public class ManiaInputManager : RulesetInputManager<ManiaAction>
     {
         public ManiaInputManager(RulesetInfo ruleset, int variant)

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

@@ -68,7 +68,8 @@ public Column(int index)
                     RelativeSizeAxes = Axes.Both
                 },
                 background,
-                TopLevelContainer = new Container { RelativeSizeAxes = Axes.Both }
+                TopLevelContainer = new Container { RelativeSizeAxes = Axes.Both },
+                new ColumnTouchInputArea(this)
             };
 
             hitPolicy = new OrderedHitPolicy(HitObjectContainer);
@@ -139,5 +140,50 @@ public void OnReleased(KeyBindingReleaseEvent<ManiaAction> e)
         public override bool ReceivePositionalInputAt(Vector2 screenSpacePos)
             // This probably shouldn't exist as is, but the columns in the stage are separated by a 1px border
             => DrawRectangle.Inflate(new Vector2(Stage.COLUMN_SPACING / 2, 0)).Contains(ToLocalSpace(screenSpacePos));
+
+        public class ColumnTouchInputArea : Drawable
+        {
+            private readonly Column column;
+
+            [Resolved(canBeNull: true)]
+            private ManiaInputManager maniaInputManager { get; set; }
+
+            private KeyBindingContainer<ManiaAction> keyBindingContainer;
+
+            public ColumnTouchInputArea(Column column)
+            {
+                RelativeSizeAxes = Axes.Both;
+
+                this.column = column;
+            }
+
+            protected override void LoadComplete()
+            {
+                keyBindingContainer = maniaInputManager?.KeyBindingContainer;
+            }
+
+            protected override bool OnMouseDown(MouseDownEvent e)
+            {
+                keyBindingContainer?.TriggerPressed(column.Action.Value);
+                return base.OnMouseDown(e);
+            }
+
+            protected override void OnMouseUp(MouseUpEvent e)
+            {
+                keyBindingContainer?.TriggerReleased(column.Action.Value);
+                base.OnMouseUp(e);
+            }
+
+            protected override bool OnTouchDown(TouchDownEvent e)
+            {
+                keyBindingContainer?.TriggerPressed(column.Action.Value);
+                return true;
+            }
+
+            protected override void OnTouchUp(TouchUpEvent e)
+            {
+                keyBindingContainer?.TriggerReleased(column.Action.Value);
+            }
+        }
     }
 }

osu.Game.Rulesets.Mania/UI/Components/DefaultKeyArea.cs

@@ -69,7 +69,7 @@ private void load(IScrollingInfo scrollingInfo)
                                 AlwaysPresent = true
                             }
                         }
-                    }
+                    },
                 }
             };
 

osu.Game/Rulesets/UI/RulesetInputManager.cs

@@ -24,6 +24,8 @@ namespace osu.Game.Rulesets.UI
     public abstract class RulesetInputManager<T> : PassThroughInputManager, ICanAttachKeyCounter, IHasReplayHandler, IHasRecordingHandler
         where T : struct
     {
+        public readonly KeyBindingContainer<T> KeyBindingContainer;
+
         private ReplayRecorder recorder;
 
         public ReplayRecorder Recorder
@@ -43,8 +45,6 @@ public ReplayRecorder Recorder
 
         protected override InputState CreateInitialState() => new RulesetInputManagerInputState<T>(base.CreateInitialState());
 
-        protected readonly KeyBindingContainer<T> KeyBindingContainer;
-
         protected override Container<Drawable> Content => content;
 
         private readonly Container content;