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

Fix merge conflicts.

Browse Source
This commit is contained in:
Lucas A
2020-10-07 13:28:49 +02:00
parent 2766cf73b4 1566882dc4
commit 7f5cf04b2b
335 changed files with 6502 additions and 1952 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
osu.Game/Screens/Ranking/Expanded/Statistics/CounterStatistic.cs
View File

@ -2,6 +2,7 @@
// See the LICENCE file in the repository root for full licence text.
using osu.Framework.Graphics;
using osu.Framework.Graphics.Containers;
using osu.Game.Graphics;
using osu.Game.Graphics.Sprites;
using osu.Game.Graphics.UserInterface;
@ -16,6 +17,7 @@ namespace osu.Game.Screens.Ranking.Expanded.Statistics
public class CounterStatistic : StatisticDisplay
{
private readonly int count;
private readonly int? maxCount;
protected RollingCounter<int> Counter { get; private set; }
@ -24,10 +26,12 @@ namespace osu.Game.Screens.Ranking.Expanded.Statistics
/// </summary>
/// <param name="header">The name of the statistic.</param>
/// <param name="count">The value to display.</param>
public CounterStatistic(string header, int count)
/// <param name="maxCount">The maximum value of <paramref name="count"/>. Not displayed if null.</param>
public CounterStatistic(string header, int count, int? maxCount = null)
: base(header)
{
this.count = count;
this.maxCount = maxCount;
}
public override void Appear()
@ -36,7 +40,33 @@ namespace osu.Game.Screens.Ranking.Expanded.Statistics
Counter.Current.Value = count;
}
protected override Drawable CreateContent() => Counter = new StatisticCounter();
protected override Drawable CreateContent()
{
var container = new FillFlowContainer
{
AutoSizeAxes = Axes.Both,
Direction = FillDirection.Horizontal,
Child = Counter = new Counter
{
Anchor = Anchor.TopCentre,
Origin = Anchor.TopCentre
}
};
if (maxCount != null)
{
container.Add(new OsuSpriteText
{
Anchor = Anchor.BottomCentre,
Origin = Anchor.BottomCentre,
Font = OsuFont.Torus.With(size: 12, fixedWidth: true),
Spacing = new Vector2(-2, 0),
Text = $"/{maxCount}"
});
}
return container;
}
private class StatisticCounter : RollingCounter<int>
{