Merge branch 'master' of https://github.com/ppy/osu

osu-framework

@@ -1 +1 @@
-Subproject commit eea84aaefcc7a1a6732d105ba319272dd9744901
+Subproject commit d87dab204b3df50f62e6070b1970c135ea647d78

osu.Game/Beatmaps/Drawables/BeatmapSetHeader.cs

@@ -64,11 +64,7 @@ namespace osu.Game.Beatmaps.Drawables
                     {
                         RelativeSizeAxes = Axes.Both,
                         OnLoadComplete = d => d.FadeInFromZero(400, Easing.Out),
-                    }
+                    }, 300),
-                )
-                {
-                    TimeBeforeLoad = 300,
-                },
                 new FillFlowContainer
                 {
                     Direction = FillDirection.Vertical,

osu.Game/Overlays/BeatmapSet/Header.cs

@@ -56,20 +56,17 @@ namespace osu.Game.Overlays.BeatmapSet
                 videoButtons.FadeTo(BeatmapSet.OnlineInfo.HasVideo ? 1 : 0, transition_duration);
 
                 cover?.FadeOut(400, Easing.Out);
-                coverContainer.Add(cover = new DelayedLoadWrapper(new BeatmapSetCover(BeatmapSet)
+                coverContainer.Add(cover = new DelayedLoadWrapper(
-                {
+                    new BeatmapSetCover(BeatmapSet)
-                    Anchor = Anchor.Centre,
-                    Origin = Anchor.Centre,
-                    RelativeSizeAxes = Axes.Both,
-                    FillMode = FillMode.Fill,
-                    OnLoadComplete = d =>
                     {
-                        d.FadeInFromZero(400, Easing.Out);
+                        Anchor = Anchor.Centre,
-                    },
+                        Origin = Anchor.Centre,
-                })
+                        RelativeSizeAxes = Axes.Both,
+                        FillMode = FillMode.Fill,
+                        OnLoadComplete = d => d.FadeInFromZero(400, Easing.Out),
+                    }, 300)
                 {
                     RelativeSizeAxes = Axes.Both,
-                    TimeBeforeLoad = 300
                 });
             }
         }
@@ -232,7 +229,7 @@ namespace osu.Game.Overlays.BeatmapSet
         protected override void Dispose(bool isDisposing)
         {
             base.Dispose(isDisposing);
-            beatmaps.BeatmapSetAdded -= handleBeatmapAdd;
+            if (beatmaps != null) beatmaps.BeatmapSetAdded -= handleBeatmapAdd;
         }
 
         private void handleBeatmapAdd(BeatmapSetInfo beatmap)

osu.Game/Overlays/Direct/DirectPanel.cs

@@ -212,21 +212,21 @@ namespace osu.Game.Overlays.Direct
             return icons;
         }
 
-        protected Drawable CreateBackground() => new DelayedLoadWrapper(new BeatmapSetCover(SetInfo)
+        protected Drawable CreateBackground() => new DelayedLoadWrapper(
-        {
+            new BeatmapSetCover(SetInfo)
-            Anchor = Anchor.Centre,
-            Origin = Anchor.Centre,
-            RelativeSizeAxes = Axes.Both,
-            FillMode = FillMode.Fill,
-            OnLoadComplete = d =>
             {
-                d.FadeInFromZero(400, Easing.Out);
+                Anchor = Anchor.Centre,
-                BlackBackground.Delay(400).FadeOut();
+                Origin = Anchor.Centre,
-            },
+                RelativeSizeAxes = Axes.Both,
-        })
+                FillMode = FillMode.Fill,
+                OnLoadComplete = d =>
+                {
+                    d.FadeInFromZero(400, Easing.Out);
+                    BlackBackground.Delay(400).FadeOut();
+                },
+            }, 300)
         {
             RelativeSizeAxes = Axes.Both,
-            TimeBeforeLoad = 300
         };
 
         public class Statistic : FillFlowContainer

osu.Game/Overlays/Direct/PlayButton.cs

@@ -146,18 +146,17 @@ namespace osu.Game.Overlays.Direct
 
             loading = true;
 
-            Add(new AsyncLoadWrapper(trackLoader = new TrackLoader($"https://b.ppy.sh/preview/{BeatmapSet.OnlineBeatmapSetID}.mp3")
+            LoadComponentAsync(trackLoader = new TrackLoader($"https://b.ppy.sh/preview/{BeatmapSet.OnlineBeatmapSetID}.mp3"),
-            {
+                d =>
-                OnLoadComplete = d =>
                 {
-                    // we may have been replaced by another loader
+                    // We may have been replaced by another loader
                     if (trackLoader != d) return;
 
-                    Preview = (d as TrackLoader)?.Preview;
+                    Preview = d?.Preview;
                     Playing.TriggerChange();
                     loading = false;
-                },
+                    Add(trackLoader);
-            }));
+                });
         }
 
         private class TrackLoader : Drawable

osu.Game/Overlays/Profile/ProfileHeader.cs

@@ -316,19 +316,16 @@ namespace osu.Game.Overlays.Profile
 
         private void loadUser()
         {
-            coverContainer.Add(new AsyncLoadWrapper(new UserCoverBackground(user)
+            LoadComponentAsync(new UserCoverBackground(user)
             {
                 RelativeSizeAxes = Axes.Both,
                 Anchor = Anchor.Centre,
                 Origin = Anchor.Centre,
                 FillMode = FillMode.Fill,
-                OnLoadComplete = d => d.FadeInFromZero(200)
+                OnLoadComplete = d => d.FadeInFromZero(200),
-            })
+                Depth = float.MaxValue,
-            {
+            },
-                Masking = true,
+            coverContainer.Add);
-                RelativeSizeAxes = Axes.Both,
-                Depth = float.MaxValue
-            });
 
             if (user.IsSupporter) supporterTag.Show();
 

osu.Game/Screens/Multiplayer/DrawableRoom.cs

@@ -228,16 +228,16 @@ namespace osu.Game.Screens.Multiplayer
             if (value != null)
             {
                 coverContainer.FadeIn(transition_duration);
-                coverContainer.Children = new[]
+
+
+                LoadComponentAsync(new BeatmapSetCover(value.BeatmapSet)
                 {
-                    new AsyncLoadWrapper(new BeatmapSetCover(value.BeatmapSet)
+                    Anchor = Anchor.Centre,
-                    {
+                    Origin = Anchor.Centre,
-                        Anchor = Anchor.Centre,
+                    FillMode = FillMode.Fill,
-                        Origin = Anchor.Centre,
+                    OnLoadComplete = d => d.FadeInFromZero(400, Easing.Out),
-                        FillMode = FillMode.Fill,
+                },
-                        OnLoadComplete = d => d.FadeInFromZero(400, Easing.Out),
+                coverContainer.Add);
-                    }) { RelativeSizeAxes = Axes.Both },
-                };
 
                 beatmapTitle.Current = localisation.GetUnicodePreference(value.Metadata.TitleUnicode, value.Metadata.Title);
                 beatmapDash.Text = @" - ";

osu.Game/Screens/Multiplayer/RoomInspector.cs

@@ -329,17 +329,16 @@ namespace osu.Game.Screens.Multiplayer
             if (value != null)
             {
                 coverContainer.FadeIn(transition_duration);
-                coverContainer.Children = new[]
+
+                LoadComponentAsync(new BeatmapSetCover(value.BeatmapSet)
                 {
-                    new AsyncLoadWrapper(new BeatmapSetCover(value.BeatmapSet)
+                    RelativeSizeAxes = Axes.Both,
-                    {
+                    Anchor = Anchor.Centre,
-                        RelativeSizeAxes = Axes.Both,
+                    Origin = Anchor.Centre,
-                        Anchor = Anchor.Centre,
+                    FillMode = FillMode.Fill,
-                        Origin = Anchor.Centre,
+                    OnLoadComplete = d => d.FadeInFromZero(400, Easing.Out),
-                        FillMode = FillMode.Fill,
+                },
-                        OnLoadComplete = d => d.FadeInFromZero(400, Easing.Out),
+                coverContainer.Add);
-                    }) { RelativeSizeAxes = Axes.Both },
-                };
 
                 beatmapTitle.Current = localisation.GetUnicodePreference(value.Metadata.TitleUnicode, value.Metadata.Title);
                 beatmapDash.Text = @" - ";

osu.Game/Screens/Play/Player.cs

@@ -248,7 +248,10 @@ namespace osu.Game.Screens.Play
             storyboard = beatmap.Storyboard.CreateDrawable(Beatmap.Value);
             storyboard.Masking = true;
 
-            storyboardContainer.Add(asyncLoad ? new AsyncLoadWrapper(storyboard) { RelativeSizeAxes = Axes.Both } : (Drawable)storyboard);
+            if (asyncLoad)
+                LoadComponentAsync(storyboard, storyboardContainer.Add);
+            else
+                storyboardContainer.Add(storyboard);
         }
 
         public void Restart()

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

@@ -33,7 +33,7 @@ namespace osu.Game.Screens.Select.Leaderboards
 
         private Box background;
         private Container content;
-        private Container avatar;
+        private Drawable avatar;
         private DrawableRank scoreRank;
         private OsuSpriteText nameLabel;
         private GlowingSpriteText scoreLabel;
@@ -97,7 +97,7 @@ namespace osu.Game.Screens.Select.Leaderboards
                         {
                             RelativeSizeAxes = Axes.Both,
                             Padding = new MarginPadding(edge_margin),
-                            Children = new Drawable[]
+                            Children = new[]
                             {
                                 avatar = new DelayedLoadWrapper(
                                     new Avatar(Score.User)
@@ -114,7 +114,6 @@ namespace osu.Game.Screens.Select.Leaderboards
                                         },
                                     })
                                 {
-                                    TimeBeforeLoad = 500,
                                     RelativeSizeAxes = Axes.None,
                                     Size = new Vector2(HEIGHT - edge_margin * 2, HEIGHT - edge_margin * 2),
                                 },
@@ -211,7 +210,7 @@ namespace osu.Game.Screens.Select.Leaderboards
 
         public override void Show()
         {
-            foreach (var d in new Drawable[] { avatar, nameLabel, scoreLabel, scoreRank, flagBadgeContainer, maxCombo, accuracy, modsContainer })
+            foreach (var d in new[] { avatar, nameLabel, scoreLabel, scoreRank, flagBadgeContainer, maxCombo, accuracy, modsContainer })
                 d.FadeOut();
 
             Alpha = 0;

osu.Game/Users/UpdateableAvatar.cs

@@ -11,7 +11,7 @@ namespace osu.Game.Users
     /// </summary>
     public class UpdateableAvatar : Container
     {
-        private Container displayedAvatar;
+        private Drawable displayedAvatar;
 
         private User user;
 
@@ -40,11 +40,13 @@ namespace osu.Game.Users
         {
             displayedAvatar?.FadeOut(300);
             displayedAvatar?.Expire();
-            Add(displayedAvatar = new DelayedLoadWrapper(new Avatar(user)
+            Add(displayedAvatar = new DelayedLoadWrapper(
-            {
+                new Avatar(user)
-                RelativeSizeAxes = Axes.Both,
+                {
-                OnLoadComplete = d => d.FadeInFromZero(200),
+                    RelativeSizeAxes = Axes.Both,
-            }));
+                    OnLoadComplete = d => d.FadeInFromZero(200),
+                })
+            );
         }
     }
 }

osu.Game/Users/UserPanel.cs

@@ -58,14 +58,14 @@ namespace osu.Game.Users
 
             Children = new Drawable[]
             {
-                new AsyncLoadWrapper(new UserCoverBackground(user)
+                new DelayedLoadWrapper(new UserCoverBackground(user)
                 {
                     RelativeSizeAxes = Axes.Both,
                     Anchor = Anchor.Centre,
                     Origin = Anchor.Centre,
                     FillMode = FillMode.Fill,
                     OnLoadComplete = d => d.FadeInFromZero(200),
-                }) { RelativeSizeAxes = Axes.Both },
+                }, 0) { RelativeSizeAxes = Axes.Both },
                 new Box
                 {
                     RelativeSizeAxes = Axes.Both,