RepoMirrors
/
osu
mirror of https://github.com/ppy/osu
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Move badge hierarchy declaration to constructor for safer access

This commit is contained in:
Salman Ahmed 2022-05-14 21:54:52 +03:00
parent 1878578196
commit 4bb06873d5
1 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
osu.Game/Overlays/BeatmapSet/BeatmapBadge.cs
View File

@ -32,26 +32,22 @@ public Colour4 BadgeColour
set => badgeLabel.Colour = value; set => badgeLabel.Colour = value;
} }
private OsuSpriteText badgeLabel = null!; private readonly Box background;
private readonly OsuSpriteText badgeLabel;
protected BeatmapBadge() protected BeatmapBadge()
{ {
AutoSizeAxes = Axes.Both; AutoSizeAxes = Axes.Both;
}
[BackgroundDependencyLoader(true)]
private void load(OsuColour colours, OverlayColourProvider? colourProvider)
{
InternalChild = new CircularContainer InternalChild = new CircularContainer
{ {
Masking = true, Masking = true,
AutoSizeAxes = Axes.Both, AutoSizeAxes = Axes.Both,
Children = new Drawable[] Children = new Drawable[]
{ {
new Box background = new Box
{ {
RelativeSizeAxes = Axes.Both, RelativeSizeAxes = Axes.Both,
Colour = colourProvider?.Background5 ?? colours.Gray2,
}, },
badgeLabel = new OsuSpriteText badgeLabel = new OsuSpriteText
{ {
@ -61,5 +57,11 @@ private void load(OsuColour colours, OverlayColourProvider? colourProvider)
} }
}; };
} }
[BackgroundDependencyLoader(true)]
private void load(OsuColour colours, OverlayColourProvider? colourProvider)
{
background.Colour = colourProvider?.Background5 ?? colours.Gray2;
}
} }
} }