From f8d6b8e347c18e2bf0bec85cdf76aac6f0f5d7a7 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 28 Dec 2023 14:10:52 +0900
Subject: [PATCH] Adjust toolbar animations / layering to feel better

---
 osu.Game/Overlays/Toolbar/ToolbarButton.cs              | 2 +-
 osu.Game/Overlays/Toolbar/ToolbarOverlayToggleButton.cs | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/osu.Game/Overlays/Toolbar/ToolbarButton.cs b/osu.Game/Overlays/Toolbar/ToolbarButton.cs
index bd5faf1588..03a1cfc005 100644
--- a/osu.Game/Overlays/Toolbar/ToolbarButton.cs
+++ b/osu.Game/Overlays/Toolbar/ToolbarButton.cs
@@ -183,7 +183,7 @@ namespace osu.Game.Overlays.Toolbar
 
         protected override bool OnClick(ClickEvent e)
         {
-            flashBackground.FadeOutFromOne(800, Easing.OutQuint);
+            flashBackground.FadeIn(50).Then().FadeOutFromOne(800, Easing.OutQuint);
             tooltipContainer.FadeOut(100);
             return base.OnClick(e);
         }
diff --git a/osu.Game/Overlays/Toolbar/ToolbarOverlayToggleButton.cs b/osu.Game/Overlays/Toolbar/ToolbarOverlayToggleButton.cs
index 09b8df14a6..06755a9da9 100644
--- a/osu.Game/Overlays/Toolbar/ToolbarOverlayToggleButton.cs
+++ b/osu.Game/Overlays/Toolbar/ToolbarOverlayToggleButton.cs
@@ -53,7 +53,7 @@ namespace osu.Game.Overlays.Toolbar
                 RelativeSizeAxes = Axes.Both,
                 Colour = colours.Carmine.Opacity(180),
                 Blending = BlendingParameters.Additive,
-                Depth = 2,
+                Depth = float.MaxValue,
                 Alpha = 0,
             });
 
@@ -65,11 +65,11 @@ namespace osu.Game.Overlays.Toolbar
             switch (state.NewValue)
             {
                 case Visibility.Hidden:
-                    stateBackground.FadeOut(200);
+                    stateBackground.FadeOut(200, Easing.OutQuint);
                     break;
 
                 case Visibility.Visible:
-                    stateBackground.FadeIn(200);
+                    stateBackground.FadeIn(200, Easing.OutQuint);
                     break;
             }
         }