From cc7fb0e559b096566b2874607f2ff5f57ca8e0e3 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 31 Jan 2022 16:36:56 +0900
Subject: [PATCH] Add mouse click support and increase area to full column
 height

---
 osu.Game.Rulesets.Mania/UI/Column.cs | 72 +++++++++++++++-------------
 1 file changed, 40 insertions(+), 32 deletions(-)

diff --git a/osu.Game.Rulesets.Mania/UI/Column.cs b/osu.Game.Rulesets.Mania/UI/Column.cs
index cd5f3d2170..9bcd9ad853 100644
--- a/osu.Game.Rulesets.Mania/UI/Column.cs
+++ b/osu.Game.Rulesets.Mania/UI/Column.cs
@@ -28,7 +28,6 @@ namespace osu.Game.Rulesets.Mania.UI
     {
         public const float COLUMN_WIDTH = 80;
         public const float SPECIAL_COLUMN_WIDTH = 70;
-        public const float TOUCH_AREA_HEIGHT = 100;
 
         /// <summary>
         /// The index of this column as part of the whole playfield.
@@ -45,37 +44,6 @@ namespace osu.Game.Rulesets.Mania.UI
 
         private readonly GameplaySampleTriggerSource sampleTriggerSource;
 
-        public class ColumnTouchInputArea : Drawable
-        {
-            public ColumnTouchInputArea()
-            {
-                RelativeSizeAxes = Axes.X;
-                Anchor = Anchor.BottomCentre;
-                Origin = Anchor.BottomCentre;
-                Height = TOUCH_AREA_HEIGHT;
-            }
-
-            private Column column => (Column)Parent;
-
-            protected override void LoadComplete()
-            {
-                keyBindingContainer = (ManiaInputManager.RulesetKeyBindingContainer)((ManiaInputManager)GetContainingInputManager()).KeyBindingContainer;
-            }
-
-            private ManiaInputManager.RulesetKeyBindingContainer keyBindingContainer { get; set; }
-
-            protected override bool OnTouchDown(TouchDownEvent e)
-            {
-                keyBindingContainer.TriggerPressed(column.Action.Value);
-                return false;
-            }
-
-            protected override void OnTouchUp(TouchUpEvent e)
-            {
-                keyBindingContainer.TriggerReleased(column.Action.Value);
-            }
-        }
-
         public Column(int index)
         {
             Index = index;
@@ -172,5 +140,45 @@ namespace osu.Game.Rulesets.Mania.UI
         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
+        {
+            public ColumnTouchInputArea()
+            {
+                RelativeSizeAxes = Axes.Both;
+            }
+
+            private Column column => (Column)Parent;
+
+            protected override void LoadComplete()
+            {
+                keyBindingContainer = (ManiaInputManager.RulesetKeyBindingContainer)((ManiaInputManager)GetContainingInputManager()).KeyBindingContainer;
+            }
+
+            private ManiaInputManager.RulesetKeyBindingContainer keyBindingContainer { get; set; }
+
+            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);
+            }
+        }
     }
 }