Always show the same number of placeholder digits in argon judgement counter when it is vertical

Author: bdach

osu.Game.Tests/Visual/Gameplay/TestSceneArgonJudgementCounter.cs

@@ -101,6 +101,19 @@ public void TestChangeFlowDirection()
 
             AddStep("Set direction vertical", () => counterDisplay.FlowDirection.Value = Direction.Vertical);
             AddStep("Set direction horizontal", () => counterDisplay.FlowDirection.Value = Direction.Horizontal);
+
+            AddStep("add 100 ok judgements", () =>
+            {
+                for (int i = 0; i < 100; i++)
+                    applyOneJudgement(HitResult.Ok);
+            });
+            AddStep("add 1000 great judgements", () =>
+            {
+                for (int i = 0; i < 1000; i++)
+                    applyOneJudgement(HitResult.Great);
+            });
+
+            AddToggleStep("toggle max judgement display", t => counterDisplay.ShowMaxJudgement.Value = t);
         }
 
         [Test]

osu.Game/Skinning/Components/ArgonJudgementCounter.cs

@@ -21,6 +21,9 @@ public sealed partial class ArgonJudgementCounter : VisibilityContainer
         public readonly JudgementCount Result;
 
         public IBindable<float> WireframeOpacity => textComponent.WireframeOpacity;
+
+        public IBindable<int?> WireframeDigits { get; } = new Bindable<int?>();
+
         public IBindable<bool> ShowLabel => textComponent.ShowLabel;
 
         private readonly ArgonCounterTextComponent textComponent;
@@ -39,13 +42,15 @@ public ArgonJudgementCounter(JudgementCount result)
 
         private void updateWireframe()
         {
-            int wireframeLength = Math.Max(2, textComponent.Text.ToString().Length);
-            textComponent.WireframeTemplate = new string('#', wireframeLength);
+            textComponent.WireframeTemplate = new string('#', WireframeDigits.Value ?? Math.Max(2, textComponent.Text.ToString().Length));
         }
 
         protected override void LoadComplete()
         {
             base.LoadComplete();
+
+            WireframeDigits.BindValueChanged(_ => updateWireframe());
+
             displayedValue.BindTo(Result.ResultCount);
             displayedValue.BindValueChanged(v =>
             {
@@ -64,6 +69,6 @@ private Color4 getJudgementColor(HitResult result)
         }
 
         protected override void PopIn() => this.FadeIn(JudgementCounterDisplay.TRANSFORM_DURATION, Easing.OutQuint);
-        protected override void PopOut() => this.FadeOut(100);
+        protected override void PopOut() => this.FadeOut();
     }
 }

osu.Game/Skinning/Components/ArgonJudgementCounterDisplay.cs

@@ -44,6 +44,8 @@ public partial class ArgonJudgementCounterDisplay : CompositeDrawable, ISerialis
         [SettingSource(typeof(JudgementCounterDisplayStrings), nameof(JudgementCounterDisplayStrings.FlowDirection))]
         public Bindable<Direction> FlowDirection { get; } = new Bindable<Direction>();
 
+        private readonly Bindable<int?> wireframeDigits = new Bindable<int?>();
+
         protected FillFlowContainer<ArgonJudgementCounter> CounterFlow = null!;
 
         [BackgroundDependencyLoader]
@@ -59,9 +61,13 @@ private void load()
 
             foreach (var counter in judgementCountController.Counters)
             {
-                ArgonJudgementCounter counterComponent = new ArgonJudgementCounter(counter);
-                counterComponent.WireframeOpacity.BindTo(WireframeOpacity);
-                counterComponent.ShowLabel.BindTo(ShowLabel);
+                counter.ResultCount.BindValueChanged(_ => updateWireframeDigits());
+                ArgonJudgementCounter counterComponent = new ArgonJudgementCounter(counter)
+                {
+                    WireframeOpacity = { BindTarget = WireframeOpacity },
+                    WireframeDigits = { BindTarget = wireframeDigits },
+                    ShowLabel = { BindTarget = ShowLabel },
+                };
                 CounterFlow.Add(counterComponent);
             }
         }
@@ -71,7 +77,7 @@ protected override void LoadComplete()
             base.LoadComplete();
             Mode.BindValueChanged(_ => updateVisibility());
             ShowMaxJudgement.BindValueChanged(_ => updateVisibility(), true);
-            FlowDirection.BindValueChanged(d => CounterFlow.Direction = getFillDirection(d.NewValue), true);
+            FlowDirection.BindValueChanged(_ => updateFlowDirection(), true);
         }
 
         private void updateVisibility()
@@ -85,6 +91,21 @@ private void updateVisibility()
                 else
                     counter.Hide();
             }
+
+            updateWireframeDigits();
+        }
+
+        private void updateFlowDirection()
+        {
+            CounterFlow.Direction = getFillDirection(FlowDirection.Value);
+            updateWireframeDigits();
+        }
+
+        private void updateWireframeDigits()
+        {
+            wireframeDigits.Value = FlowDirection.Value == Direction.Vertical
+                ? Math.Max(2, CounterFlow.Children.Where(counter => counter.State.Value == Visibility.Visible).Max(counter => counter.Result.ResultCount.Value).ToString().Length)
+                : null;
         }
 
         private bool shouldBeVisible(int index, ArgonJudgementCounter counter)