Add loading spinner when loading first run screens

Lawtrohux · May 10, 2022 · a93c63b · a93c63b
1 parent 25c6226
commit a93c63b
Showing 1 changed file with 15 additions and 1 deletion.
diff --git a/osu.Game/Overlays/FirstRunSetupOverlay.cs b/osu.Game/Overlays/FirstRunSetupOverlay.cs
@@ -15,6 +15,7 @@
 using osu.Framework.Input.Events;
 using osu.Framework.Localisation;
 using osu.Framework.Screens;
+using osu.Framework.Threading;
 using osu.Game.Configuration;
 using osu.Game.Graphics;
 using osu.Game.Graphics.UserInterface;
@@ -68,6 +69,9 @@ public class FirstRunSetupOverlay : ShearedOverlayContainer
 
         private Container content = null!;
 
+        private LoadingSpinner loading = null!;
+        private ScheduledDelegate? loadingShowDelegate;
+
         public FirstRunSetupOverlay()
             : base(OverlayColourScheme.Purple)
         {
@@ -115,6 +119,7 @@ private void load(OsuColour colours)
                                             RelativeSizeAxes = Axes.Both,
                                             Colour = ColourProvider.Background6,
                                         },
+                                        loading = new LoadingSpinner(),
                                         new Container
                                         {
                                             RelativeSizeAxes = Axes.Both,
@@ -310,7 +315,16 @@ private void showNextStep()
 
             if (currentStepIndex < steps.Length)
             {
-                stack.Push((Screen)Activator.CreateInstance(steps[currentStepIndex.Value]));
+                var nextScreen = (Screen)Activator.CreateInstance(steps[currentStepIndex.Value]);
+
+                loadingShowDelegate = Scheduler.AddDelayed(() => loading.Show(), 200);
+                nextScreen.OnLoadComplete += _ =>
+                {
+                    loadingShowDelegate?.Cancel();
+                    loading.Hide();
+                };
+
+                stack.Push(nextScreen);
             }
             else
             {