From ba73968303b3e6ac29dff7ff69219e408388041d Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 17 Mar 2017 18:28:21 +0900
Subject: [PATCH] Load whole panel background in async.
---
.../Beatmaps/Drawables/BeatmapSetHeader.cs | 43 ++++++++-----------
1 file changed, 18 insertions(+), 25 deletions(-)
diff --git a/osu.Game/Beatmaps/Drawables/BeatmapSetHeader.cs b/osu.Game/Beatmaps/Drawables/BeatmapSetHeader.cs
index c1ac93f70c..cb6fa02553 100644
--- a/osu.Game/Beatmaps/Drawables/BeatmapSetHeader.cs
+++ b/osu.Game/Beatmaps/Drawables/BeatmapSetHeader.cs
@@ -32,10 +32,6 @@ namespace osu.Game.Beatmaps.Drawables
Children = new Drawable[]
{
- new PanelBackground(beatmap)
- {
- RelativeSizeAxes = Axes.Both,
- },
new FillFlowContainer
{
Direction = FillDirection.Vertical,
@@ -74,13 +70,23 @@ namespace osu.Game.Beatmaps.Drawables
}
[BackgroundDependencyLoader]
- private void load(OsuConfigManager config)
+ private void load(OsuConfigManager config, OsuGameBase game)
{
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)
@@ -98,16 +104,18 @@ namespace osu.Game.Beatmaps.Drawables
private class PanelBackground : BufferedContainer
{
- private readonly WorkingBeatmap working;
-
public PanelBackground(WorkingBeatmap working)
{
- this.working = working;
-
CacheDrawnFrameBuffer = true;
- Children = new[]
+ Children = new Drawable[]
{
+ new BeatmapBackgroundSprite(working)
+ {
+ Anchor = Anchor.Centre,
+ Origin = Anchor.Centre,
+ FillMode = FillMode.Fill,
+ },
new FillFlowContainer
{
Depth = -1,
@@ -151,21 +159,6 @@ namespace osu.Game.Beatmaps.Drawables
},
};
}
-
- [BackgroundDependencyLoader]
- private void load(OsuGameBase game)
- {
- new BeatmapBackgroundSprite(working)
- {
- Anchor = Anchor.Centre,
- Origin = Anchor.Centre,
- FillMode = FillMode.Fill,
- }.LoadAsync(game, bg =>
- {
- Add(bg);
- ForceRedraw();
- });
- }
}
public void AddDifficultyIcons(IEnumerable<BeatmapPanel> panels)