Use DelayedLoadContainer in more places.

osu.Game/Beatmaps/Drawables/BeatmapSetHeader.cs

@@ -33,12 +33,25 @@ namespace osu.Game.Beatmaps.Drawables
 
             Children = new Drawable[]
             {
+                new DelayedLoadContainer
+                {
+                    RelativeSizeAxes = Axes.Both,
+                    TimeBeforeLoad = 100,
+                    Children = new[]
+                    {
+                        new PanelBackground(beatmap)
+                        {
+                            RelativeSizeAxes = Axes.Both,
+                            Depth = 1,
+                        }
+                    }
+                },
                 new FillFlowContainer
                 {
                     Direction = FillDirection.Vertical,
                     Padding = new MarginPadding { Top = 5, Left = 18, Right = 10, Bottom = 10 },
                     AutoSizeAxes = Axes.Both,
-                    Children = new[]
+                    Children = new Drawable[]
                     {
                         title = new OsuSpriteText
                         {
@@ -71,23 +84,13 @@ namespace osu.Game.Beatmaps.Drawables
         }
 
         [BackgroundDependencyLoader]
-        private void load(OsuConfigManager config, OsuGameBase game)
+        private void load(OsuConfigManager config)
         {
             this.config = config;
 
             preferUnicode = config.GetBindable<bool>(OsuConfig.ShowUnicode);
             preferUnicode.ValueChanged += preferUnicode_changed;
             preferUnicode_changed(preferUnicode, null);
-
-            new PanelBackground(beatmap)
-            {
-                RelativeSizeAxes = Axes.Both,
-                Depth = 1,
-            }.LoadAsync(game, b =>
-            {
-                Add(b);
-                b.FadeInFromZero(200);
-            });
         }
 
         private void preferUnicode_changed(object sender, EventArgs e)

osu.Game/Overlays/MusicController.cs

@@ -29,7 +29,7 @@ namespace osu.Game.Overlays
 {
     public class MusicController : FocusedOverlayContainer
     {
-        private MusicControllerBackground backgroundSprite;
+        private Drawable currentBackground;
         private DragBar progress;
         private TextAwesome playButton;
         private SpriteText title, artist;
@@ -44,7 +44,6 @@ namespace osu.Game.Overlays
         private Bindable<bool> preferUnicode;
         private WorkingBeatmap current;
         private BeatmapDatabase beatmaps;
-        private Framework.Game game;
 
         private Container dragContainer;
 
@@ -78,10 +77,8 @@ namespace osu.Game.Overlays
         }
 
         [BackgroundDependencyLoader]
-        private void load(OsuGameBase osuGame, OsuConfigManager config, BeatmapDatabase beatmaps, OsuColour colours)
+        private void load(OsuGameBase game, OsuConfigManager config, BeatmapDatabase beatmaps, OsuColour colours)
         {
-            game = osuGame;
-
             unicodeString = config.GetUnicodeString;
 
             Children = new Drawable[]
@@ -212,15 +209,15 @@ namespace osu.Game.Overlays
             };
 
             this.beatmaps = beatmaps;
-            trackManager = osuGame.Audio.Track;
+            trackManager = game.Audio.Track;
             preferUnicode = config.GetBindable<bool>(OsuConfig.ShowUnicode);
             preferUnicode.ValueChanged += preferUnicode_changed;
 
-            beatmapSource = osuGame.Beatmap ?? new Bindable<WorkingBeatmap>();
+            beatmapSource = game.Beatmap ?? new Bindable<WorkingBeatmap>();
             playList = beatmaps.GetAllWithChildren<BeatmapSetInfo>();
 
-            backgroundSprite = new MusicControllerBackground();
+            currentBackground = new MusicControllerBackground();
-            dragContainer.Add(backgroundSprite);
+            dragContainer.Add(currentBackground);
         }
 
         protected override void LoadComplete()
@@ -351,29 +348,29 @@ namespace osu.Game.Overlays
                     }
                 });
 
-                MusicControllerBackground newBackground;
+                dragContainer.Add(new AsyncLoadContainer
-
-                (newBackground = new MusicControllerBackground(beatmap)).LoadAsync(game, delegate
                 {
-
+                    RelativeSizeAxes = Axes.Both,
-                    dragContainer.Add(newBackground);
+                    Depth = float.MaxValue,
-
+                    Children = new[] { new MusicControllerBackground(beatmap) },
-                    switch (direction)
+                    FinishedLoading = d =>
                     {
-                        case TransformDirection.Next:
+                        switch (direction)
-                            newBackground.Position = new Vector2(400, 0);
+                        {
-                            newBackground.MoveToX(0, 500, EasingTypes.OutCubic);
+                            case TransformDirection.Next:
-                            backgroundSprite.MoveToX(-400, 500, EasingTypes.OutCubic);
+                                d.Position = new Vector2(400, 0);
-                            break;
+                                d.MoveToX(0, 500, EasingTypes.OutCubic);
-                        case TransformDirection.Prev:
+                                currentBackground.MoveToX(-400, 500, EasingTypes.OutCubic);
-                            newBackground.Position = new Vector2(-400, 0);
+                                break;
-                            newBackground.MoveToX(0, 500, EasingTypes.OutCubic);
+                            case TransformDirection.Prev:
-                            backgroundSprite.MoveToX(400, 500, EasingTypes.OutCubic);
+                                d.Position = new Vector2(-400, 0);
-                            break;
+                                d.MoveToX(0, 500, EasingTypes.OutCubic);
+                                currentBackground.MoveToX(400, 500, EasingTypes.OutCubic);
+                                break;
+                        }
+                        currentBackground.Expire();
+                        currentBackground = d;
                     }
-
-                    backgroundSprite.Expire();
-                    backgroundSprite = newBackground;
                 });
             };
         }
@@ -422,8 +419,8 @@ namespace osu.Game.Overlays
             {
                 this.beatmap = beatmap;
                 CacheDrawnFrameBuffer = true;
-                RelativeSizeAxes = Axes.Both;
                 Depth = float.MaxValue;
+                RelativeSizeAxes = Axes.Both;
 
                 Children = new Drawable[]
                 {

osu.Game/Screens/Select/BeatmapInfoWedge.cs

@@ -6,7 +6,6 @@ using System.Collections.Generic;
 using System.Linq;
 using OpenTK;
 using OpenTK.Graphics;
-using osu.Framework.Allocation;
 using osu.Framework.Extensions.Color4Extensions;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Colour;
@@ -30,9 +29,7 @@ namespace osu.Game.Screens.Select
     {
         private static readonly Vector2 wedged_container_shear = new Vector2(0.15f, 0);
 
-        private BufferedContainer beatmapInfoContainer;
+        private Drawable beatmapInfoContainer;
-
-        private OsuGameBase game;
 
         public BeatmapInfoWedge()
         {
@@ -49,12 +46,6 @@ namespace osu.Game.Screens.Select
             };
         }
 
-        [BackgroundDependencyLoader]
-        private void load(OsuGameBase game)
-        {
-            this.game = game;
-        }
-
         protected override bool HideOnEscape => false;
 
         protected override void PopIn()
@@ -113,105 +104,111 @@ namespace osu.Game.Screens.Select
                 labels.AddRange(Ruleset.GetRuleset(beatmap.BeatmapInfo.Mode).GetBeatmapStatistics(beatmap).Select(s => new InfoLabel(s)));
             }
 
-            (beatmapInfoContainer = new BufferedContainer
+            Add(beatmapInfoContainer = new AsyncLoadContainer
             {
-                Depth = newDepth,
+                FinishedLoading = d =>
-                PixelSnapping = true,
-                CacheDrawnFrameBuffer = true,
-                Shear = -Shear,
-                RelativeSizeAxes = Axes.Both,
-                Children = new Drawable[]
                 {
-                    // We will create the white-to-black gradient by modulating transparency and having
+                    FadeIn(250);
-                    // a black backdrop. This results in an sRGB-space gradient and not linear space,
+
-                    // transitioning from white to black more perceptually uniformly.
+                    lastContainer?.FadeOut(250);
-                    new Box
+                    lastContainer?.Expire();
+                },
+                Depth = newDepth,
+                RelativeSizeAxes = Axes.Both,
+                Children = new[]
+                {
+                    new BufferedContainer
                     {
+                        PixelSnapping = true,
+                        CacheDrawnFrameBuffer = true,
+                        Shear = -Shear,
                         RelativeSizeAxes = Axes.Both,
-                        Colour = Color4.Black,
-                    },
-                    // We use a container, such that we can set the colour gradient to go across the
-                    // vertices of the masked container instead of the vertices of the (larger) sprite.
-                    new Container
-                    {
-                        RelativeSizeAxes = Axes.Both,
-                        ColourInfo = ColourInfo.GradientVertical(Color4.White, Color4.White.Opacity(0.3f)),
-                        Children = new []
-                        {
-                            // Zoomed-in and cropped beatmap background
-                            new BeatmapBackgroundSprite(beatmap)
-                            {
-                                Anchor = Anchor.Centre,
-                                Origin = Anchor.Centre,
-                                FillMode = FillMode.Fill,
-                            },
-                        },
-                    },
-                    // Text for beatmap info
-                    new FillFlowContainer
-                    {
-                        Anchor = Anchor.BottomLeft,
-                        Origin = Anchor.BottomLeft,
-                        Direction = FillDirection.Vertical,
-                        Margin = new MarginPadding { Top = 10, Left = 25, Right = 10, Bottom = 20 },
-                        AutoSizeAxes = Axes.Both,
                         Children = new Drawable[]
                         {
-                            new OsuSpriteText
+                            // We will create the white-to-black gradient by modulating transparency and having
+                            // a black backdrop. This results in an sRGB-space gradient and not linear space,
+                            // transitioning from white to black more perceptually uniformly.
+                            new Box
                             {
-                                Font = @"Exo2.0-MediumItalic",
+                                RelativeSizeAxes = Axes.Both,
-                                Text = metadata.Artist + " -- " + metadata.Title,
+                                Colour = Color4.Black,
-                                TextSize = 28,
-                                Shadow = true,
                             },
-                            new OsuSpriteText
+                            // We use a container, such that we can set the colour gradient to go across the
+                            // vertices of the masked container instead of the vertices of the (larger) sprite.
+                            new Container
                             {
-                                Font = @"Exo2.0-MediumItalic",
+                                RelativeSizeAxes = Axes.Both,
-                                Text = beatmapInfo.Version,
+                                ColourInfo = ColourInfo.GradientVertical(Color4.White, Color4.White.Opacity(0.3f)),
-                                TextSize = 17,
+                                Children = new[]
-                                Shadow = true,
+                                {
+                                    // Zoomed-in and cropped beatmap background
+                                    new BeatmapBackgroundSprite(beatmap)
+                                    {
+                                        Anchor = Anchor.Centre,
+                                        Origin = Anchor.Centre,
+                                        FillMode = FillMode.Fill,
+                                    },
+                                },
                             },
+                            // Text for beatmap info
                             new FillFlowContainer
                             {
-                                Margin = new MarginPadding { Top = 10 },
+                                Anchor = Anchor.BottomLeft,
-                                Direction = FillDirection.Horizontal,
+                                Origin = Anchor.BottomLeft,
+                                Direction = FillDirection.Vertical,
+                                Margin = new MarginPadding { Top = 10, Left = 25, Right = 10, Bottom = 20 },
                                 AutoSizeAxes = Axes.Both,
-                                Children = new []
+                                Children = new Drawable[]
                                 {
                                     new OsuSpriteText
                                     {
-                                        Font = @"Exo2.0-Medium",
+                                        Font = @"Exo2.0-MediumItalic",
-                                        Text = "mapped by ",
+                                        Text = metadata.Artist + " -- " + metadata.Title,
-                                        TextSize = 15,
+                                        TextSize = 28,
                                         Shadow = true,
                                     },
                                     new OsuSpriteText
                                     {
-                                        Font = @"Exo2.0-Bold",
+                                        Font = @"Exo2.0-MediumItalic",
-                                        Text = metadata.Author,
+                                        Text = beatmapInfo.Version,
-                                        TextSize = 15,
+                                        TextSize = 17,
                                         Shadow = true,
                                     },
+                                    new FillFlowContainer
+                                    {
+                                        Margin = new MarginPadding { Top = 10 },
+                                        Direction = FillDirection.Horizontal,
+                                        AutoSizeAxes = Axes.Both,
+                                        Children = new[]
+                                        {
+                                            new OsuSpriteText
+                                            {
+                                                Font = @"Exo2.0-Medium",
+                                                Text = "mapped by ",
+                                                TextSize = 15,
+                                                Shadow = true,
+                                            },
+                                            new OsuSpriteText
+                                            {
+                                                Font = @"Exo2.0-Bold",
+                                                Text = metadata.Author,
+                                                TextSize = 15,
+                                                Shadow = true,
+                                            },
+                                        }
+                                    },
+                                    new FillFlowContainer
+                                    {
+                                        Margin = new MarginPadding { Top = 20 },
+                                        Spacing = new Vector2(40, 0),
+                                        AutoSizeAxes = Axes.Both,
+                                        Children = labels
+                                    },
                                 }
                             },
-                            new FillFlowContainer
-                            {
-                                Margin = new MarginPadding { Top = 20 },
-                                Spacing = new Vector2(40, 0),
-                                AutoSizeAxes = Axes.Both,
-                                Children = labels
-                            },
                         }
-                    },
+                    }
                 }
-            }).LoadAsync(game, delegate (Drawable d)
-            {
-                FadeIn(250);
-
-                lastContainer?.FadeOut(250);
-                lastContainer?.Expire();
-
-                Add(d);
             });
         }
 

osu.Game/Screens/Select/Leaderboards/LeaderboardScore.cs

@@ -145,6 +145,7 @@ namespace osu.Game.Screens.Select.Leaderboards
                                 avatar = new DelayedLoadContainer
                                 {
                                     TimeBeforeLoad = 500,
+                                    FinishedLoading = d => d.FadeInFromZero(200),
                                     Size = new Vector2(HEIGHT - edge_margin * 2, HEIGHT - edge_margin * 2),
                                     Children = new Drawable[]
                                     {

osu.Game/Users/UpdateableAvatar.cs

@@ -43,6 +43,7 @@ namespace osu.Game.Users
             Add(displayedAvatar = new AsyncLoadContainer
             {
                 RelativeSizeAxes = Axes.Both,
+                FinishedLoading = d => d.FadeInFromZero(200),
                 Children = new[]
                 {
                     new Avatar(user) { RelativeSizeAxes = Axes.Both }