sim1222/osukey
1
1
Fork 0
mirror of https://github.com/osukey/osukey.git synced 2025-08-03 14:46:38 +09:00
Code Issues Packages Projects Releases Wiki Activity

Fix backgrounds not correctly handling initial async load

Browse Source
This commit is contained in:
Dean Herbert
2019-03-12 00:05:05 +09:00
parent 81d9e391f4
commit e9ab329e93
2 changed files with 38 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
osu.Game/Screens/Backgrounds/BackgroundScreenBeatmap.cs
View File

@ -36,28 +36,34 @@ namespace osu.Game.Screens.Backgrounds
beatmap = value;
Schedule(() =>
{
LoadComponentAsync(new BeatmapBackground(beatmap), b => Schedule(() =>
{
float newDepth = 0;
if (Background != null)
{
newDepth = Background.Depth + 1;
Background.FinishTransforms();
Background.FadeOut(250);
Background.Expire();
}
b.Depth = newDepth;
fadeContainer.Add(Background = b);
Background.BlurSigma = BlurTarget;
StoryboardReplacesBackground.BindTo(fadeContainer.StoryboardReplacesBackground);
}));
});
Schedule(() => { LoadComponentAsync(new BeatmapBackground(beatmap), b => Schedule(() => backgroundLoaded(b))); });
}
}
private void backgroundLoaded(BeatmapBackground b)
{
float newDepth = 0;
if (Background != null)
{
newDepth = Background.Depth + 1;
Background.FinishTransforms();
Background.FadeOut(250);
Background.Expire();
}
b.Depth = newDepth;
fadeContainer.Add(Background = b);
Background.BlurSigma = BlurTarget;
StoryboardReplacesBackground.BindTo(fadeContainer.StoryboardReplacesBackground);
}
[BackgroundDependencyLoader]
private void load()
{
if (beatmap != null)
backgroundLoaded(new BeatmapBackground(beatmap));
}
public BackgroundScreenBeatmap(WorkingBeatmap beatmap = null)
{
Beatmap = beatmap;