From 0e764538e0ea81293ef99994b25e3ab7ceed609e Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 31 Jan 2022 16:47:20 +0900
Subject: [PATCH] Retrieve `KeyBindingContainer` via DI rather than traversal
 lookup

---
 osu.Game.Rulesets.Mania/ManiaInputManager.cs |  2 ++
 osu.Game.Rulesets.Mania/UI/Column.cs         | 17 ++++++++++-------
 osu.Game/Rulesets/UI/RulesetInputManager.cs  |  4 ++--
 3 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/osu.Game.Rulesets.Mania/ManiaInputManager.cs b/osu.Game.Rulesets.Mania/ManiaInputManager.cs
index 186fc4b15d..14ca27a11a 100644
--- a/osu.Game.Rulesets.Mania/ManiaInputManager.cs
+++ b/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)
diff --git a/osu.Game.Rulesets.Mania/UI/Column.cs b/osu.Game.Rulesets.Mania/UI/Column.cs
index 9bcd9ad853..a6c64e9b2d 100644
--- a/osu.Game.Rulesets.Mania/UI/Column.cs
+++ b/osu.Game.Rulesets.Mania/UI/Column.cs
@@ -143,6 +143,11 @@ namespace osu.Game.Rulesets.Mania.UI
 
         public class ColumnTouchInputArea : Drawable
         {
+            [Resolved(canBeNull: true)]
+            private ManiaInputManager maniaInputManager { get; set; }
+
+            private KeyBindingContainer<ManiaAction> keyBindingContainer;
+
             public ColumnTouchInputArea()
             {
                 RelativeSizeAxes = Axes.Both;
@@ -152,32 +157,30 @@ namespace osu.Game.Rulesets.Mania.UI
 
             protected override void LoadComplete()
             {
-                keyBindingContainer = (ManiaInputManager.RulesetKeyBindingContainer)((ManiaInputManager)GetContainingInputManager()).KeyBindingContainer;
+                keyBindingContainer = maniaInputManager?.KeyBindingContainer;
             }
 
-            private ManiaInputManager.RulesetKeyBindingContainer keyBindingContainer { get; set; }
-
             protected override bool OnMouseDown(MouseDownEvent e)
             {
-                keyBindingContainer.TriggerPressed(column.Action.Value);
+                keyBindingContainer?.TriggerPressed(column.Action.Value);
                 return base.OnMouseDown(e);
             }
 
             protected override void OnMouseUp(MouseUpEvent e)
             {
-                keyBindingContainer.TriggerReleased(column.Action.Value);
+                keyBindingContainer?.TriggerReleased(column.Action.Value);
                 base.OnMouseUp(e);
             }
 
             protected override bool OnTouchDown(TouchDownEvent e)
             {
-                keyBindingContainer.TriggerPressed(column.Action.Value);
+                keyBindingContainer?.TriggerPressed(column.Action.Value);
                 return true;
             }
 
             protected override void OnTouchUp(TouchUpEvent e)
             {
-                keyBindingContainer.TriggerReleased(column.Action.Value);
+                keyBindingContainer?.TriggerReleased(column.Action.Value);
             }
         }
     }
diff --git a/osu.Game/Rulesets/UI/RulesetInputManager.cs b/osu.Game/Rulesets/UI/RulesetInputManager.cs
index 160c0a2606..84e42818be 100644
--- a/osu.Game/Rulesets/UI/RulesetInputManager.cs
+++ b/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 @@ namespace osu.Game.Rulesets.UI
 
         protected override InputState CreateInitialState() => new RulesetInputManagerInputState<T>(base.CreateInitialState());
 
-        public readonly KeyBindingContainer<T> KeyBindingContainer;
-
         protected override Container<Drawable> Content => content;
 
         private readonly Container content;