Fix legacy key counter's background being visible when intended to be…

… hidden
ppy · Aug 6, 2024 · 5f69b74 · 5f69b74
1 parent 90395ae
commit 5f69b74
Show file tree

Hide file tree

Showing 4 changed files with 26 additions and 15 deletions.
diff --git a/osu.Game/Screens/Play/ArgonKeyCounterDisplay.cs b/osu.Game/Screens/Play/ArgonKeyCounterDisplay.cs
@@ -14,7 +14,7 @@ public partial class ArgonKeyCounterDisplay : KeyCounterDisplay
 
         public ArgonKeyCounterDisplay()
         {
-            InternalChild = KeyFlow = new FillFlowContainer<KeyCounter>
+            Child = KeyFlow = new FillFlowContainer<KeyCounter>
             {
                 Direction = FillDirection.Horizontal,
                 AutoSizeAxes = Axes.Both,

diff --git a/osu.Game/Screens/Play/HUD/DefaultKeyCounterDisplay.cs b/osu.Game/Screens/Play/HUD/DefaultKeyCounterDisplay.cs
@@ -16,7 +16,7 @@ public partial class DefaultKeyCounterDisplay : KeyCounterDisplay
 
         public DefaultKeyCounterDisplay()
         {
-            InternalChild = KeyFlow = new FillFlowContainer<KeyCounter>
+            Child = KeyFlow = new FillFlowContainer<KeyCounter>
             {
                 Direction = FillDirection.Horizontal,
                 AutoSizeAxes = Axes.Both,

diff --git a/osu.Game/Screens/Play/HUD/KeyCounterDisplay.cs b/osu.Game/Screens/Play/HUD/KeyCounterDisplay.cs
@@ -15,7 +15,7 @@ namespace osu.Game.Screens.Play.HUD
     /// <summary>
     /// A flowing display of all gameplay keys. Individual keys can be added using <see cref="InputTrigger"/> implementations.
     /// </summary>
-    public abstract partial class KeyCounterDisplay : CompositeDrawable, ISerialisableDrawable
+    public abstract partial class KeyCounterDisplay : Container, ISerialisableDrawable
     {
         /// <summary>
         /// Whether the key counter should be visible regardless of the configuration value.
@@ -29,25 +29,22 @@ public abstract partial class KeyCounterDisplay : CompositeDrawable, ISerialisab
 
         private readonly IBindableList<InputTrigger> triggers = new BindableList<InputTrigger>();
 
+        protected override Container<Drawable> Content { get; } = new Container
+        {
+            Alpha = 0,
+            AutoSizeAxes = Axes.Both,
+        };
+
         [Resolved]
         private InputCountController controller { get; set; } = null!;
 
         private const int duration = 100;
 
-        protected void UpdateVisibility()
+        protected KeyCounterDisplay()
         {
-            bool visible = AlwaysVisible.Value || ConfigVisibility.Value;
-
-            // Isolate changing visibility of the key counters from fading this component.
-            KeyFlow.FadeTo(visible ? 1 : 0, duration);
-
-            // Ensure a valid size is immediately obtained even if partially off-screen
-            // See https://github.com/ppy/osu/issues/14793.
-            KeyFlow.AlwaysPresent = visible;
+            AddInternal(Content);
         }
 
-        protected abstract KeyCounter CreateCounter(InputTrigger trigger);
-
         [BackgroundDependencyLoader]
         private void load(OsuConfigManager config, DrawableRuleset? drawableRuleset)
         {
@@ -70,6 +67,20 @@ protected override void LoadComplete()
             ConfigVisibility.BindValueChanged(_ => UpdateVisibility(), true);
         }
 
+        protected void UpdateVisibility()
+        {
+            bool visible = AlwaysVisible.Value || ConfigVisibility.Value;
+
+            // Isolate changing visibility of the key counters from fading this component.
+            Content.FadeTo(visible ? 1 : 0, duration);
+
+            // Ensure a valid size is immediately obtained even if partially off-screen
+            // See https://github.com/ppy/osu/issues/14793.
+            Content.AlwaysPresent = visible;
+        }
+
+        protected abstract KeyCounter CreateCounter(InputTrigger trigger);
+
         private void triggersChanged(object? sender, NotifyCollectionChangedEventArgs e)
         {
             KeyFlow.Clear();

diff --git a/osu.Game/Skinning/LegacyKeyCounterDisplay.cs b/osu.Game/Skinning/LegacyKeyCounterDisplay.cs
@@ -26,7 +26,7 @@ public LegacyKeyCounterDisplay()
         {
             AutoSizeAxes = Axes.Both;
 
-            AddRangeInternal(new Drawable[]
+            AddRange(new Drawable[]
             {
                 backgroundSprite = new Sprite
                 {