From aa2e0028ab3c20cb4e0afe412e12670e3b14f96f Mon Sep 17 00:00:00 2001
From: tsrk <tsrk@tsrk.me>
Date: Mon, 13 Feb 2023 10:59:10 +0000
Subject: [PATCH] refactor: hide trigger presence from content

---
 osu.Game/Screens/Play/KeyCounter.cs | 32 +++++++++++++++++------------
 1 file changed, 19 insertions(+), 13 deletions(-)

diff --git a/osu.Game/Screens/Play/KeyCounter.cs b/osu.Game/Screens/Play/KeyCounter.cs
index a612edbace..b111305b22 100644
--- a/osu.Game/Screens/Play/KeyCounter.cs
+++ b/osu.Game/Screens/Play/KeyCounter.cs
@@ -14,6 +14,10 @@ namespace osu.Game.Screens.Play
 
         protected Bindable<bool> IsCountingBindable = new BindableBool(true);
 
+        private readonly Container content;
+
+        protected override Container<Drawable> Content => content;
+
         protected Bindable<int> PressesCount = new BindableInt
         {
             MinValue = 0
@@ -31,6 +35,21 @@ namespace osu.Game.Screens.Play
             private set => PressesCount.Value = value;
         }
 
+        protected KeyCounter(Trigger trigger)
+        {
+            InternalChildren = new Drawable[]
+            {
+                content = new Container
+                {
+                    RelativeSizeAxes = Axes.Both
+                },
+                CounterTrigger = trigger,
+            };
+
+            CounterTrigger.Target = this;
+            Name = trigger.Name;
+        }
+
         protected Bindable<bool> IsLit = new BindableBool();
 
         public void Increment()
@@ -49,21 +68,8 @@ namespace osu.Game.Screens.Play
             CountPresses--;
         }
 
-        protected override void LoadComplete()
-        {
-            Add(CounterTrigger);
-            base.LoadComplete();
-        }
-
         protected override bool Handle(UIEvent e) => CounterTrigger.TriggerEvent(e);
 
-        protected KeyCounter(Trigger trigger)
-        {
-            CounterTrigger = trigger;
-            trigger.Target = this;
-            Name = trigger.Name;
-        }
-
         public abstract partial class Trigger : Component
         {
             private KeyCounter? target;