OnBdl -> OnLoadAsync

This commit is contained in:
Salman Ahmed 2021-06-25 10:40:07 +03:00
parent f07008a0a2
commit 06e357647a

View File

@ -32,7 +32,7 @@ namespace osu.Game.Tests.Rulesets
[Test] [Test]
public void TestEarlyAddedSkinRequester() public void TestEarlyAddedSkinRequester()
{ {
ISample transformerSampleOnBdl = null; ISample transformerSampleOnLoad = null;
// need a legacy skin to plug the TestRuleset's legacy transformer, which is required for testing this. // need a legacy skin to plug the TestRuleset's legacy transformer, which is required for testing this.
AddStep("set legacy skin", () => skins.CurrentSkinInfo.Value = DefaultLegacySkin.Info); AddStep("set legacy skin", () => skins.CurrentSkinInfo.Value = DefaultLegacySkin.Info);
@ -43,26 +43,26 @@ namespace osu.Game.Tests.Rulesets
rulesetSkinProvider.Add(requester = new SkinRequester()); rulesetSkinProvider.Add(requester = new SkinRequester());
requester.OnBdl += () => transformerSampleOnBdl = requester.GetSample(new SampleInfo(TestLegacySkinTransformer.VIRTUAL_SAMPLE_NAME)); requester.OnLoadAsync += () => transformerSampleOnLoad = requester.GetSample(new SampleInfo(TestLegacySkinTransformer.VIRTUAL_SAMPLE_NAME));
Child = rulesetSkinProvider; Child = rulesetSkinProvider;
}); });
AddAssert("requester got correct initial sample", () => transformerSampleOnBdl != null); AddAssert("requester got correct initial sample", () => transformerSampleOnLoad != null);
} }
private class SkinRequester : Drawable, ISkin private class SkinRequester : Drawable, ISkin
{ {
private ISkinSource skin; private ISkinSource skin;
public event Action OnBdl; public event Action OnLoadAsync;
[BackgroundDependencyLoader] [BackgroundDependencyLoader]
private void load(ISkinSource skin) private void load(ISkinSource skin)
{ {
this.skin = skin; this.skin = skin;
OnBdl?.Invoke(); OnLoadAsync?.Invoke();
} }
public Drawable GetDrawableComponent(ISkinComponent component) => skin.GetDrawableComponent(component); public Drawable GetDrawableComponent(ISkinComponent component) => skin.GetDrawableComponent(component);