From 8e226319e2603b0fc8aae7c645c6709fcef19f85 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 10 May 2021 15:40:33 +0900
Subject: [PATCH] Remove downwards dependency from `HUDOverlay` to
 `HealthDisplay`

---
 osu.Game/Screens/Play/HUD/HealthDisplay.cs | 13 +++++++++++--
 osu.Game/Screens/Play/HUDOverlay.cs        |  4 +---
 2 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/osu.Game/Screens/Play/HUD/HealthDisplay.cs b/osu.Game/Screens/Play/HUD/HealthDisplay.cs
index 6c2571cc28..e0ddde026b 100644
--- a/osu.Game/Screens/Play/HUD/HealthDisplay.cs
+++ b/osu.Game/Screens/Play/HUD/HealthDisplay.cs
@@ -3,6 +3,7 @@
 
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
+using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Game.Rulesets.Judgements;
 using osu.Game.Rulesets.Scoring;
@@ -16,6 +17,8 @@ namespace osu.Game.Screens.Play.HUD
     /// </summary>
     public abstract class HealthDisplay : Container
     {
+        private Bindable<bool> showHealthbar;
+
         [Resolved]
         protected HealthProcessor HealthProcessor { get; private set; }
 
@@ -29,12 +32,18 @@ namespace osu.Game.Screens.Play.HUD
         {
         }
 
-        [BackgroundDependencyLoader]
-        private void load()
+        [BackgroundDependencyLoader(true)]
+        private void load(HUDOverlay hud)
         {
             Current.BindTo(HealthProcessor.Health);
 
             HealthProcessor.NewJudgement += onNewJudgement;
+
+            if (hud != null)
+            {
+                showHealthbar = hud.ShowHealthbar.GetBoundCopy();
+                showHealthbar.BindValueChanged(healthBar => this.FadeTo(healthBar.NewValue ? 1 : 0, HUDOverlay.FADE_DURATION, HUDOverlay.FADE_EASING), true);
+            }
         }
 
         private void onNewJudgement(JudgementResult judgement)
diff --git a/osu.Game/Screens/Play/HUDOverlay.cs b/osu.Game/Screens/Play/HUDOverlay.cs
index 6ddaa338cc..c9b80be3dc 100644
--- a/osu.Game/Screens/Play/HUDOverlay.cs
+++ b/osu.Game/Screens/Play/HUDOverlay.cs
@@ -36,7 +36,6 @@ namespace osu.Game.Screens.Play
         public readonly KeyCounterDisplay KeyCounter;
         public readonly SkinnableScoreCounter ScoreCounter;
         public readonly SkinnableAccuracyCounter AccuracyCounter;
-        public readonly SkinnableHealthDisplay HealthDisplay;
         public readonly SongProgress Progress;
         public readonly ModDisplay ModDisplay;
         public readonly HoldForMenuButton HoldToQuit;
@@ -96,7 +95,7 @@ namespace osu.Game.Screens.Play
                                     RelativeSizeAxes = Axes.Both,
                                     Children = new Drawable[]
                                     {
-                                        HealthDisplay = CreateHealthDisplay(),
+                                        CreateHealthDisplay(),
                                         AccuracyCounter = CreateAccuracyCounter(),
                                         ScoreCounter = CreateScoreCounter(),
                                         CreateComboCounter(),
@@ -185,7 +184,6 @@ namespace osu.Game.Screens.Play
         {
             base.LoadComplete();
 
-            ShowHealthbar.BindValueChanged(healthBar => HealthDisplay.FadeTo(healthBar.NewValue ? 1 : 0, FADE_DURATION, FADE_EASING), true);
             ShowHud.BindValueChanged(visible => hideTargets.ForEach(d => d.FadeTo(visible.NewValue ? 1 : 0, FADE_DURATION, FADE_EASING)));
 
             IsBreakTime.BindValueChanged(_ => updateVisibility());