Merge remote-tracking branch 'upstream/master' into combo-colors

This commit is contained in:
Craftplacer
2020-08-15 23:01:38 +02:00
46 changed files with 1118 additions and 304 deletions

View File

@ -67,19 +67,18 @@ namespace osu.Game.Beatmaps.Drawables
if (beatmapSet != null)
{
BeatmapSetCover cover;
Add(displayedCover = new DelayedLoadWrapper(
cover = new BeatmapSetCover(beatmapSet, coverType)
Add(displayedCover = new DelayedLoadUnloadWrapper(() =>
{
var cover = new BeatmapSetCover(beatmapSet, coverType)
{
Anchor = Anchor.Centre,
Origin = Anchor.Centre,
RelativeSizeAxes = Axes.Both,
FillMode = FillMode.Fill,
})
);
cover.OnLoadComplete += d => d.FadeInFromZero(400, Easing.Out);
};
cover.OnLoadComplete += d => d.FadeInFromZero(400, Easing.Out);
return cover;
}));
}
}
}