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

Small cleanups

Browse Source
This commit is contained in:
Andrei Zavatski 2019-09-29 15:27:29 +03:00
parent 138e65d7a4
commit febe0175cd
4 changed files with 42 additions and 68 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
osu.Game/Overlays/Rankings/Tables/CountriesTable.cs
View File

@ -60,28 +60,14 @@ namespace osu.Game.Overlays.Rankings.Tables
new ColoredText new ColoredText
{ {
Text = $@"{item.ActiveUsers:N0}", Text = $@"{item.ActiveUsers:N0}",
Font = OsuFont.GetFont(size: TEXT_SIZE),
},
new ColoredMetricNumber(item.PlayCount)
{
Font = OsuFont.GetFont(size: TEXT_SIZE),
},
new ColoredMetricNumber(item.RankedScore)
{
Font = OsuFont.GetFont(size: TEXT_SIZE),
},
new ColoredMetricNumber(item.RankedScore / Math.Max(item.ActiveUsers, 1))
{
Font = OsuFont.GetFont(size: TEXT_SIZE),
},
new MetricNumber(item.Performance)
{
Font = OsuFont.GetFont(size: TEXT_SIZE),
}, },
new ColoredMetricNumber(item.PlayCount),
new ColoredMetricNumber(item.RankedScore),
new ColoredMetricNumber(item.RankedScore / Math.Max(item.ActiveUsers, 1)),
new MetricNumber(item.Performance),
new ColoredText new ColoredText
{ {
Text = $@"{item.Performance / Math.Max(item.ActiveUsers, 1):N0}", Text = $@"{item.Performance / Math.Max(item.ActiveUsers, 1):N0}",
Font = OsuFont.GetFont(size: TEXT_SIZE),
} }
}; };
} }

36
osu.Game/Overlays/Rankings/Tables/PerformanceTable.cs
View File

@ -46,33 +46,30 @@ namespace osu.Game.Overlays.Rankings.Tables
var username = new LinkFlowContainer(t => t.Font = OsuFont.GetFont(size: TEXT_SIZE)) { AutoSizeAxes = Axes.Both }; var username = new LinkFlowContainer(t => t.Font = OsuFont.GetFont(size: TEXT_SIZE)) { AutoSizeAxes = Axes.Both };
username.AddUserLink(item.User); username.AddUserLink(item.User);
content.Add(new FillFlowContainer
{
AutoSizeAxes = Axes.Both,
Direction = FillDirection.Horizontal,
Spacing = new Vector2(7, 0),
Children = new Drawable[]
{
new UpdateableFlag(item.User.Country)
{
Size = new Vector2(20, 13),
ShowPlaceholderOnNull = false,
},
username
}
});
content.AddRange(new Drawable[] content.AddRange(new Drawable[]
{ {
new FillFlowContainer
{
AutoSizeAxes = Axes.Both,
Direction = FillDirection.Horizontal,
Spacing = new Vector2(7, 0),
Children = new Drawable[]
{
new UpdateableFlag(item.User.Country)
{
Size = new Vector2(20, 13),
ShowPlaceholderOnNull = false,
},
username
}
},
new ColoredText new ColoredText
{ {
Text = $@"{item.Accuracy:F2}%", Text = $@"{item.Accuracy:F2}%",
Font = OsuFont.GetFont(size: TEXT_SIZE),
}, },
new ColoredText new ColoredText
{ {
Text = $@"{item.PlayCount:N0}", Text = $@"{item.PlayCount:N0}",
Font = OsuFont.GetFont(size: TEXT_SIZE),
}, },
new OsuSpriteText new OsuSpriteText
{ {
@ -82,17 +79,14 @@ namespace osu.Game.Overlays.Rankings.Tables
new ColoredText new ColoredText
{ {
Text = $@"{item.GradesCount.SS + item.GradesCount.SSPlus:N0}", Text = $@"{item.GradesCount.SS + item.GradesCount.SSPlus:N0}",
Font = OsuFont.GetFont(size: TEXT_SIZE),
}, },
new ColoredText new ColoredText
{ {
Text = $@"{item.GradesCount.S + item.GradesCount.SPlus:N0}", Text = $@"{item.GradesCount.S + item.GradesCount.SPlus:N0}",
Font = OsuFont.GetFont(size: TEXT_SIZE),
}, },
new ColoredText new ColoredText
{ {
Text = $@"{item.GradesCount.A:N0}", Text = $@"{item.GradesCount.A:N0}",
Font = OsuFont.GetFont(size: TEXT_SIZE),
}, },
}); });

6
osu.Game/Overlays/Rankings/Tables/RankingsTable.cs
View File

@ -99,6 +99,7 @@ namespace osu.Game.Overlays.Rankings.Tables
this.value = value; this.value = value;
Text = HumanizerUtils.ToReadableString(value); Text = HumanizerUtils.ToReadableString(value);
Font = OsuFont.GetFont(size: TEXT_SIZE);
} }
} }
@ -118,6 +119,11 @@ namespace osu.Game.Overlays.Rankings.Tables
protected class ColoredText : OsuSpriteText protected class ColoredText : OsuSpriteText
{ {
public ColoredText()
{
Font = OsuFont.GetFont(size: TEXT_SIZE);
}
[BackgroundDependencyLoader] [BackgroundDependencyLoader]
private void load(OsuColour colours) private void load(OsuColour colours)
{ {

46
osu.Game/Overlays/Rankings/Tables/ScoresTable.cs
View File

@ -47,56 +47,44 @@ namespace osu.Game.Overlays.Rankings.Tables
var username = new LinkFlowContainer(t => t.Font = OsuFont.GetFont(size: TEXT_SIZE)) { AutoSizeAxes = Axes.Both }; var username = new LinkFlowContainer(t => t.Font = OsuFont.GetFont(size: TEXT_SIZE)) { AutoSizeAxes = Axes.Both };
username.AddUserLink(item.User); username.AddUserLink(item.User);
content.Add(new FillFlowContainer
{
AutoSizeAxes = Axes.Both,
Direction = FillDirection.Horizontal,
Spacing = new Vector2(7, 0),
Children = new Drawable[]
{
new UpdateableFlag(item.User.Country)
{
Size = new Vector2(20, 13),
ShowPlaceholderOnNull = false,
},
username
}
});
content.AddRange(new Drawable[] content.AddRange(new Drawable[]
{ {
new FillFlowContainer
{
AutoSizeAxes = Axes.Both,
Direction = FillDirection.Horizontal,
Spacing = new Vector2(7, 0),
Children = new Drawable[]
{
new UpdateableFlag(item.User.Country)
{
Size = new Vector2(20, 13),
ShowPlaceholderOnNull = false,
},
username
}
},
new ColoredText new ColoredText
{ {
Text = $@"{item.Accuracy:F2}%", Text = $@"{item.Accuracy:F2}%",
Font = OsuFont.GetFont(size: TEXT_SIZE),
}, },
new ColoredText new ColoredText
{ {
Text = $@"{item.PlayCount:N0}", Text = $@"{item.PlayCount:N0}",
Font = OsuFont.GetFont(size: TEXT_SIZE),
},
new ColoredMetricNumber(item.TotalScore)
{
Font = OsuFont.GetFont(size: TEXT_SIZE),
},
new MetricNumber(item.RankedScore)
{
Font = OsuFont.GetFont(size: TEXT_SIZE),
}, },
new ColoredMetricNumber(item.TotalScore),
new MetricNumber(item.RankedScore),
new ColoredText new ColoredText
{ {
Text = $@"{item.GradesCount.SS + item.GradesCount.SSPlus:N0}", Text = $@"{item.GradesCount.SS + item.GradesCount.SSPlus:N0}",
Font = OsuFont.GetFont(size: TEXT_SIZE),
}, },
new ColoredText new ColoredText
{ {
Text = $@"{item.GradesCount.S + item.GradesCount.SPlus:N0}", Text = $@"{item.GradesCount.S + item.GradesCount.SPlus:N0}",
Font = OsuFont.GetFont(size: TEXT_SIZE),
}, },
new ColoredText new ColoredText
{ {
Text = $@"{item.GradesCount.A:N0}", Text = $@"{item.GradesCount.A:N0}",
Font = OsuFont.GetFont(size: TEXT_SIZE),
}, },
}); });