From ea027eda46ebdb8ed8b13674fcbbdca3b96360c4 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 28 Jul 2022 18:29:49 +0900
Subject: [PATCH] Move initial show to base implementation and add transition
 for legacy version

---
 osu.Game/Screens/Play/HUD/DefaultSongProgress.cs | 2 --
 osu.Game/Screens/Play/HUD/SongProgress.cs        | 9 ++++++++-
 osu.Game/Skinning/LegacySongProgress.cs          | 8 ++------
 3 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/osu.Game/Screens/Play/HUD/DefaultSongProgress.cs b/osu.Game/Screens/Play/HUD/DefaultSongProgress.cs
index 36b172cb44..b4eade0709 100644
--- a/osu.Game/Screens/Play/HUD/DefaultSongProgress.cs
+++ b/osu.Game/Screens/Play/HUD/DefaultSongProgress.cs
@@ -104,8 +104,6 @@ namespace osu.Game.Screens.Play.HUD
 
         protected override void LoadComplete()
         {
-            Show();
-
             AllowSeeking.BindValueChanged(_ => updateBarVisibility(), true);
             ShowGraph.BindValueChanged(_ => updateGraphVisibility(), true);
 
diff --git a/osu.Game/Screens/Play/HUD/SongProgress.cs b/osu.Game/Screens/Play/HUD/SongProgress.cs
index 78f0142dba..35847b4b16 100644
--- a/osu.Game/Screens/Play/HUD/SongProgress.cs
+++ b/osu.Game/Screens/Play/HUD/SongProgress.cs
@@ -36,13 +36,20 @@ namespace osu.Game.Screens.Play.HUD
             }
         }
 
+        protected override void LoadComplete()
+        {
+            base.LoadComplete();
+
+            Show();
+        }
+
         protected double FirstHitTime { get; private set; }
 
         //TODO: this isn't always correct (consider mania where a non-last object may last for longer than the last in the list).
         protected double LastHitTime { get; private set; }
 
         protected abstract void UpdateProgress(double progress, bool isIntro);
-        protected abstract void UpdateObjects(IEnumerable<HitObject>? objects);
+        protected virtual void UpdateObjects(IEnumerable<HitObject>? objects) { }
 
         [BackgroundDependencyLoader]
         private void load()
diff --git a/osu.Game/Skinning/LegacySongProgress.cs b/osu.Game/Skinning/LegacySongProgress.cs
index 963209d4ce..3fba0e5abe 100644
--- a/osu.Game/Skinning/LegacySongProgress.cs
+++ b/osu.Game/Skinning/LegacySongProgress.cs
@@ -1,13 +1,11 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-using System.Collections.Generic;
 using osu.Framework.Allocation;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Shapes;
 using osu.Framework.Graphics.UserInterface;
-using osu.Game.Rulesets.Objects;
 using osu.Game.Screens.Play.HUD;
 using osuTK;
 
@@ -60,14 +58,12 @@ namespace osu.Game.Skinning
 
         protected override void PopIn()
         {
+            this.FadeIn(500, Easing.OutQuint);
         }
 
         protected override void PopOut()
         {
-        }
-
-        protected override void UpdateObjects(IEnumerable<HitObject>? objects)
-        {
+            this.FadeOut(100);
         }
 
         protected override void UpdateProgress(double progress, bool isIntro)