From 0560eb41201d0094d8321927bc3498502065c994 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 18 Jan 2021 18:22:21 +0900
Subject: [PATCH 1/2] Reduce final fill alpha of main menu confirm-to-exit

---
 osu.Game/Overlays/HoldToConfirmOverlay.cs   | 13 +++++++++++--
 osu.Game/Screens/Menu/ExitConfirmOverlay.cs |  5 +++++
 2 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Overlays/HoldToConfirmOverlay.cs b/osu.Game/Overlays/HoldToConfirmOverlay.cs
index eb325d8dd3..0542f66b5b 100644
--- a/osu.Game/Overlays/HoldToConfirmOverlay.cs
+++ b/osu.Game/Overlays/HoldToConfirmOverlay.cs
@@ -24,6 +24,13 @@ namespace osu.Game.Overlays
         [Resolved]
         private AudioManager audio { get; set; }
 
+        private readonly float finalFillAlpha;
+
+        protected HoldToConfirmOverlay(float finalFillAlpha = 1)
+        {
+            this.finalFillAlpha = finalFillAlpha;
+        }
+
         [BackgroundDependencyLoader]
         private void load()
         {
@@ -42,8 +49,10 @@ namespace osu.Game.Overlays
 
             Progress.ValueChanged += p =>
             {
-                audioVolume.Value = 1 - p.NewValue;
-                overlay.Alpha = (float)p.NewValue;
+                var target = p.NewValue * finalFillAlpha;
+
+                audioVolume.Value = 1 - target;
+                overlay.Alpha = (float)target;
             };
 
             audio.Tracks.AddAdjustment(AdjustableProperty.Volume, audioVolume);
diff --git a/osu.Game/Screens/Menu/ExitConfirmOverlay.cs b/osu.Game/Screens/Menu/ExitConfirmOverlay.cs
index db2faeb60a..a491283e5f 100644
--- a/osu.Game/Screens/Menu/ExitConfirmOverlay.cs
+++ b/osu.Game/Screens/Menu/ExitConfirmOverlay.cs
@@ -13,6 +13,11 @@ namespace osu.Game.Screens.Menu
 
         public void Abort() => AbortConfirm();
 
+        public ExitConfirmOverlay()
+            : base(0.7f)
+        {
+        }
+
         public bool OnPressed(GlobalAction action)
         {
             if (action == GlobalAction.Back)

From 82e5a5bf6fbcc997e692e2af269a69f990343ddc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Tue, 19 Jan 2021 23:10:15 +0100
Subject: [PATCH 2/2] Mark legacy beatmap skin colour test as abstract

---
 osu.Game/Tests/Beatmaps/LegacyBeatmapSkinColourTest.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Tests/Beatmaps/LegacyBeatmapSkinColourTest.cs b/osu.Game/Tests/Beatmaps/LegacyBeatmapSkinColourTest.cs
index fb3432fbae..051ede30b7 100644
--- a/osu.Game/Tests/Beatmaps/LegacyBeatmapSkinColourTest.cs
+++ b/osu.Game/Tests/Beatmaps/LegacyBeatmapSkinColourTest.cs
@@ -17,7 +17,7 @@ using osuTK.Graphics;
 
 namespace osu.Game.Tests.Beatmaps
 {
-    public class LegacyBeatmapSkinColourTest : ScreenTestScene
+    public abstract class LegacyBeatmapSkinColourTest : ScreenTestScene
     {
         protected readonly Bindable<bool> BeatmapSkins = new Bindable<bool>();
         protected readonly Bindable<bool> BeatmapColours = new Bindable<bool>();