sim1222/osukey
1
1
Fork 0
mirror of https://github.com/osukey/osukey.git synced 2025-08-05 07:33:55 +09:00
Code Issues Packages Projects Releases Wiki Activity

Removed unnecessary class for wrapping

Browse Source
This commit is contained in:
Denrage
2021-05-05 18:50:49 +02:00
parent bb385f4255
commit b6b9a69601
2 changed files with 14 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -48,7 +48,8 @@ namespace osu.Game.Screens.Select
private IBindable<StarDifficulty?> beatmapDifficulty;
protected BeatmapInfoWedgeContainer Container;
protected Container Container;
protected WedgeInfoText Info;
public BeatmapInfoWedge()
{
@ -111,7 +112,7 @@ namespace osu.Game.Screens.Select
public override bool IsPresent => base.IsPresent || Container == null; // Visibility is updated in the LoadComponentAsync callback
private BeatmapInfoWedgeContainer loadingInfo;
private Container loadingInfo;
private void updateDisplay()
{
@ -134,10 +135,16 @@ namespace osu.Game.Screens.Select
return;
}
LoadComponentAsync(loadingInfo = new BeatmapInfoWedgeContainer(beatmap, ruleset.Value, mods.Value, beatmapDifficulty.Value ?? new StarDifficulty())
LoadComponentAsync(loadingInfo = new Container
{
RelativeSizeAxes = Axes.Both,
Shear = -Shear,
Depth = Container?.Depth + 1 ?? 0,
Children = new Drawable[]
{
new BeatmapInfoWedgeBackground(beatmap),
Info = new WedgeInfoText(beatmap, ruleset.Value, mods.Value, beatmapDifficulty.Value ?? new StarDifficulty()),
}
}, loaded =>
{
// ensure we are the most recent loaded wedge.
@ -520,35 +527,5 @@ namespace osu.Game.Screens.Select
}
}
}
public class BeatmapInfoWedgeContainer : Container
{
private readonly WorkingBeatmap beatmap;
private readonly RulesetInfo ruleset;
private readonly StarDifficulty starDifficulty;
private readonly IReadOnlyList<Mod> mods;
internal WedgeInfoText Info;
public BeatmapInfoWedgeContainer(WorkingBeatmap beatmap, RulesetInfo ruleset, IReadOnlyList<Mod> mods, StarDifficulty difficulty)
{
this.beatmap = beatmap;
this.ruleset = ruleset;
this.mods = mods;
starDifficulty = difficulty;
}
[BackgroundDependencyLoader]
private void load()
{
RelativeSizeAxes = Axes.Both;
Children = new Drawable[]
{
new BeatmapInfoWedgeBackground(beatmap),
Info = new WedgeInfoText(beatmap, ruleset, mods, starDifficulty),
};
}
}
}
}