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

Rewrite ScoreComponentLabel.

Browse Source
This commit is contained in:
DrabWeb 2018-06-03 22:22:44 -03:00
parent 68910745d8
commit db4c26e1ab
1 changed files with 49 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
osu.Game/Screens/Select/Leaderboards/LeaderboardScore.cs
View File

@ -142,6 +142,8 @@ namespace osu.Game.Screens.Select.Leaderboards
{ {
flagBadgeContainer = new Container flagBadgeContainer = new Container
{ {
Origin = Anchor.BottomLeft,
Anchor = Anchor.BottomLeft,
Size = new Vector2(87f, 20f), Size = new Vector2(87f, 20f),
Masking = true, Masking = true,
Children = new Drawable[] Children = new Drawable[]
@ -155,10 +157,12 @@ namespace osu.Game.Screens.Select.Leaderboards
}, },
new FillFlowContainer new FillFlowContainer
{ {
Origin = Anchor.BottomLeft,
Anchor = Anchor.BottomLeft,
AutoSizeAxes = Axes.Both, AutoSizeAxes = Axes.Both,
Direction = FillDirection.Horizontal, Direction = FillDirection.Horizontal,
Spacing = new Vector2(10f, 0f), Spacing = new Vector2(10f, 0f),
Margin = new MarginPadding { Left = edge_margin, }, Margin = new MarginPadding { Left = edge_margin },
Children = new Drawable[] Children = new Drawable[]
{ {
maxCombo = new ScoreComponentLabel(FontAwesome.fa_link, Score.MaxCombo.ToString()), maxCombo = new ScoreComponentLabel(FontAwesome.fa_link, Score.MaxCombo.ToString()),
@ -307,35 +311,55 @@ namespace osu.Game.Screens.Select.Leaderboards
private class ScoreComponentLabel : Container private class ScoreComponentLabel : Container
{ {
private const float icon_size = 20;
private readonly FillFlowContainer content;
protected override Container<Drawable> Content => content;
public ScoreComponentLabel(FontAwesome icon, string value) public ScoreComponentLabel(FontAwesome icon, string value)
{ {
Anchor = Anchor.CentreLeft; AutoSizeAxes = Axes.Y;
Origin = Anchor.CentreLeft; Width = 60;
Size = new Vector2(60f, 20f);
Padding = new MarginPadding { Top = 10f, };
InternalChild = content = new FillFlowContainer
{
AutoSizeAxes = Axes.Both,
Direction = FillDirection.Horizontal,
Children = new Drawable[] Children = new Drawable[]
{
new Container
{
Anchor = Anchor.CentreLeft,
Origin = Anchor.CentreLeft,
AutoSizeAxes = Axes.Both,
Children = new[]
{ {
new SpriteIcon new SpriteIcon
{ {
Anchor = Anchor.Centre,
Origin = Anchor.Centre, Origin = Anchor.Centre,
Icon = FontAwesome.fa_square, Size = new Vector2(icon_size),
Colour = OsuColour.FromHex(@"3087ac"),
Rotation = 45, Rotation = 45,
Size = new Vector2(20), Colour = OsuColour.FromHex(@"3087ac"),
Icon = FontAwesome.fa_square,
Shadow = true, Shadow = true,
}, },
new SpriteIcon new SpriteIcon
{ {
Anchor = Anchor.Centre,
Origin = Anchor.Centre, Origin = Anchor.Centre,
Icon = icon, Size = new Vector2(icon_size - 6),
Colour = OsuColour.FromHex(@"a4edff"), Colour = OsuColour.FromHex(@"a4edff"),
Size = new Vector2(14), Icon = icon,
},
},
}, },
new GlowingSpriteText(value, @"Exo2.0-Bold", 17, Color4.White, OsuColour.FromHex(@"83ccfa")) new GlowingSpriteText(value, @"Exo2.0-Bold", 17, Color4.White, OsuColour.FromHex(@"83ccfa"))
{ {
Anchor = Anchor.CentreLeft,
Origin = Anchor.CentreLeft, Origin = Anchor.CentreLeft,
Margin = new MarginPadding { Left = 15, }, },
}, },
}; };
} }