From efeaa1cc10ddd6d0b80ebd16651908a4be7c818a Mon Sep 17 00:00:00 2001
From: Power Maker <power_maker@o2.pl>
Date: Fri, 26 Jun 2020 14:58:42 +0200
Subject: [PATCH] Make some changes, fix and add tests

---
 .../Visual/Gameplay/TestSceneFailingLayer.cs  | 27 +++++++++++++++++++
 osu.Game/Screens/Play/HUD/FailingLayer.cs     |  3 ++-
 osu.Game/Screens/Play/HUDOverlay.cs           |  2 --
 3 files changed, 29 insertions(+), 3 deletions(-)

diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneFailingLayer.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneFailingLayer.cs
index a95e806862..83d9e888f1 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneFailingLayer.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneFailingLayer.cs
@@ -3,6 +3,7 @@
 
 using NUnit.Framework;
 using osu.Framework.Allocation;
+using osu.Framework.Bindables;
 using osu.Framework.Testing;
 using osu.Game.Configuration;
 using osu.Game.Rulesets.Scoring;
@@ -14,6 +15,8 @@ namespace osu.Game.Tests.Visual.Gameplay
     {
         private FailingLayer layer;
 
+        private Bindable<bool> enabledHUD = new Bindable<bool>();
+
         [Resolved]
         private OsuConfigManager config { get; set; }
 
@@ -24,8 +27,10 @@ namespace osu.Game.Tests.Visual.Gameplay
             {
                 Child = layer = new FailingLayer();
                 layer.BindHealthProcessor(new DrainingHealthProcessor(1));
+                layer.HUDEnabled.BindTo(enabledHUD);
             });
 
+            AddStep("enable HUDOverlay", () => enabledHUD.Value = true);
             AddStep("enable layer", () => config.Set(OsuSetting.FadePlayfieldWhenHealthLow, true));
             AddUntilStep("layer is visible", () => layer.IsPresent);
         }
@@ -69,5 +74,27 @@ namespace osu.Game.Tests.Visual.Gameplay
             AddWaitStep("wait for potential fade", 10);
             AddAssert("layer is still visible", () => layer.IsPresent);
         }
+
+        [Test]
+        public void TestLayerVisibilityWithDifferentOptions()
+        {
+            AddStep("set health to 0.10", () => layer.Current.Value = 0.1);
+
+            AddStep("disable HUDOverlay", () => enabledHUD.Value = false);
+            AddStep("disable FadePlayfieldWhenHealthLow", () => config.Set(OsuSetting.FadePlayfieldWhenHealthLow, false));
+            AddUntilStep("layer fade is invisible", () => !layer.IsPresent);
+
+            AddStep("disable HUDOverlay", () => enabledHUD.Value = false);
+            AddStep("enable FadePlayfieldWhenHealthLow", () => config.Set(OsuSetting.FadePlayfieldWhenHealthLow, true));
+            AddUntilStep("layer fade is invisible", () => !layer.IsPresent);
+
+            AddStep("enable HUDOverlay", () => enabledHUD.Value = true);
+            AddStep("disable FadePlayfieldWhenHealthLow", () => config.Set(OsuSetting.FadePlayfieldWhenHealthLow, false));
+            AddUntilStep("layer fade is invisible", () => !layer.IsPresent);
+
+            AddStep("enable HUDOverlay", () => enabledHUD.Value = true);
+            AddStep("enable FadePlayfieldWhenHealthLow", () => config.Set(OsuSetting.FadePlayfieldWhenHealthLow, true));
+            AddUntilStep("layer fade is visible", () => layer.IsPresent);
+        }
     }
 }
diff --git a/osu.Game/Screens/Play/HUD/FailingLayer.cs b/osu.Game/Screens/Play/HUD/FailingLayer.cs
index 6fda5a1214..d982764c30 100644
--- a/osu.Game/Screens/Play/HUD/FailingLayer.cs
+++ b/osu.Game/Screens/Play/HUD/FailingLayer.cs
@@ -75,7 +75,8 @@ namespace osu.Game.Screens.Play.HUD
             boxes.Colour = color.Red;
 
             configEnabled = config.GetBindable<bool>(OsuSetting.FadePlayfieldWhenHealthLow);
-            enabled.BindValueChanged(e => TryToFade(fade_time, Easing.OutQuint, e.NewValue ? true : false), true);
+            enabled.BindValueChanged(e => TryToFade(fade_time, Easing.OutQuint, e.NewValue), true);
+            HUDEnabled.BindValueChanged(e => TryToFade(fade_time, Easing.OutQuint, e.NewValue), true);
         }
 
         protected override void LoadComplete()
diff --git a/osu.Game/Screens/Play/HUDOverlay.cs b/osu.Game/Screens/Play/HUDOverlay.cs
index 73b93582ef..d4c548dce7 100644
--- a/osu.Game/Screens/Play/HUDOverlay.cs
+++ b/osu.Game/Screens/Play/HUDOverlay.cs
@@ -171,13 +171,11 @@ namespace osu.Game.Screens.Play
                 if (healthBar.NewValue)
                 {
                     HealthDisplay.FadeIn(fade_duration, fade_easing);
-                    FailingLayer.TryToFade(fade_duration, fade_easing, true);
                     topScoreContainer.MoveToY(30, fade_duration, fade_easing);
                 }
                 else
                 {
                     HealthDisplay.FadeOut(fade_duration, fade_easing);
-                    FailingLayer.TryToFade(fade_duration, fade_easing, false);
                     topScoreContainer.MoveToY(0, fade_duration, fade_easing);
                 }
             }, true);