h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2025-01-14 03:25:11 +08:00
Code Issues Releases Wiki Activity

Moved Info and Background into own container

Browse Source
This commit is contained in:
Denrage 2021-04-21 13:53:25 +02:00
parent de04caeace
commit 9fba87f67a
2 changed files with 45 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapInfoWedge.cs
View File

@ -135,15 +135,15 @@ namespace osu.Game.Tests.Visual.SongSelect
private void selectBeatmap([CanBeNull] IBeatmap b)
{
BeatmapInfoWedge.BufferedWedgeBackground backgroundBefore = null;
BeatmapInfoWedge.BeatmapInfoWedgeContainer containerBefore = null;
AddStep($"select {b?.Metadata.Title ?? "null"} beatmap", () =>
{
backgroundBefore = infoWedge.Background;
containerBefore = infoWedge.Container;
infoWedge.Beatmap = Beatmap.Value = b == null ? Beatmap.Default : CreateWorkingBeatmap(b);
});
AddUntilStep("wait for async load", () => infoWedge.Background != backgroundBefore);
AddUntilStep("wait for async load", () => infoWedge.Container != containerBefore);
}
private IBeatmap createTestBeatmap(RulesetInfo ruleset)
@ -196,6 +196,8 @@ namespace osu.Game.Tests.Visual.SongSelect
public new BufferedWedgeBackground Background => base.Background;
public new WedgeInfoText Info => base.Info;
public new BeatmapInfoWedgeContainer Container => base.Container;
}
private class TestHitObject : ConvertHitObject, IHasPosition

58
osu.Game/Screens/Select/BeatmapInfoWedge.cs
View File

@ -41,8 +41,9 @@ namespace osu.Game.Screens.Select
[Resolved]
private IBindable<RulesetInfo> ruleset { get; set; }
protected BufferedWedgeBackground Background;
protected WedgeInfoText Info;
protected BeatmapInfoWedgeContainer Container;
protected WedgeInfoText Info => Container.Info;
protected BufferedWedgeBackground Background => Container.Background;
public BeatmapInfoWedge()
{
@ -94,9 +95,9 @@ namespace osu.Game.Screens.Select
}
}
public override bool IsPresent => base.IsPresent || Background == null; // Visibility is updated in the LoadComponentAsync callback
public override bool IsPresent => base.IsPresent || Container == null; // Visibility is updated in the LoadComponentAsync callback
private BufferedWedgeBackground loadingInfo;
private BeatmapInfoWedgeContainer loadingInfo;
private void updateDisplay()
{
@ -108,13 +109,9 @@ namespace osu.Game.Screens.Select
{
State.Value = beatmap == null ? Visibility.Hidden : Visibility.Visible;
Info?.FadeOut(250);
Info?.Expire();
Info = null;
Background?.FadeOut(250);
Background?.Expire();
Background = null;
Container?.FadeOut(250);
Container?.Expire();
Container = null;
}
if (beatmap == null)
@ -123,25 +120,50 @@ namespace osu.Game.Screens.Select
return;
}
LoadComponentAsync(loadingInfo = new BufferedWedgeBackground(beatmap)
LoadComponentAsync(loadingInfo = new BeatmapInfoWedgeContainer(beatmap, ruleset.Value)
{
Shear = -Shear,
Depth = Background?.Depth + 1 ?? 0
}, loaded =>
{
// ensure we are the most recent loaded wedge.
if (loaded != loadingInfo) return;
removeOldInfo();
Add(Background = loaded);
Add(Info = new WedgeInfoText(beatmap, ruleset.Value)
{
Shear = -Shear
});
Add(Container = loaded);
});
}
}
public class BeatmapInfoWedgeContainer : Container
{
private readonly WorkingBeatmap beatmap;
private readonly RulesetInfo ruleset;
internal BufferedWedgeBackground Background;
internal WedgeInfoText Info;
public BeatmapInfoWedgeContainer(WorkingBeatmap beatmap, RulesetInfo ruleset)
{
this.beatmap = beatmap;
this.ruleset = ruleset;
}
[BackgroundDependencyLoader]
private void load()
{
RelativeSizeAxes = Axes.Both;
Children = new Drawable[]
{
Background = new BufferedWedgeBackground(beatmap)
{
Depth = Background?.Depth + 1 ?? 0,
},
Info = new WedgeInfoText(beatmap, ruleset),
};
}
}
public class WedgeInfoText : Container
{
public FillFlowContainer MapperContainer { get; private set; }