RepoMirrors/osu
1
0
Fork 0
mirror of https://github.com/ppy/osu synced 2025-02-08 14:17:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add tooltip with counts to daily challenge score breakdown chart

Browse Source
This commit is contained in:
Bartłomiej Dach 2024-07-26 13:47:41 +02:00
parent 2b083bff29
commit 2caaebb670
No known key found for this signature in database
1 changed files with 27 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
osu.Game/Screens/OnlinePlay/DailyChallenge/DailyChallengeScoreBreakdown.cs
View File

@ -6,6 +6,7 @@ using System.Linq;
using osu.Framework.Allocation; using osu.Framework.Allocation;
using osu.Framework.Graphics; using osu.Framework.Graphics;
using osu.Framework.Graphics.Containers; using osu.Framework.Graphics.Containers;
using osu.Framework.Graphics.Cursor;
using osu.Framework.Graphics.Shapes; using osu.Framework.Graphics.Shapes;
using osu.Framework.Localisation; using osu.Framework.Localisation;
using osu.Game.Graphics; using osu.Game.Graphics;
@ -44,23 +45,7 @@ namespace osu.Game.Screens.OnlinePlay.DailyChallenge
for (int i = 0; i < bin_count; ++i) for (int i = 0; i < bin_count; ++i)
{ {
LocalisableString? label = null; barsContainer.Add(new Bar(100_000 * i, 100_000 * (i + 1) - 1)
switch (i)
{
case 2:
case 4:
case 6:
case 8:
label = @$"{100 * i}k";
break;
case 10:
label = @"1M";
break;
}
barsContainer.Add(new Bar(label)
{ {
Width = 1f / bin_count, Width = 1f / bin_count,
}); });
@ -113,18 +98,20 @@ namespace osu.Game.Screens.OnlinePlay.DailyChallenge
barsContainer[i].UpdateCounts(bins[i], max); barsContainer[i].UpdateCounts(bins[i], max);
} }
private partial class Bar : CompositeDrawable private partial class Bar : CompositeDrawable, IHasTooltip
{ {
private readonly LocalisableString? label; private readonly int binStart;
private readonly int binEnd;
private long count; private long count;
private long max; private long max;
public Container CircularBar { get; private set; } = null!; public Container CircularBar { get; private set; } = null!;
public Bar(LocalisableString? label = null) public Bar(int binStart, int binEnd)
{ {
this.label = label; this.binStart = binStart;
this.binEnd = binEnd;
} }
[BackgroundDependencyLoader] [BackgroundDependencyLoader]
@ -159,13 +146,29 @@ namespace osu.Game.Screens.OnlinePlay.DailyChallenge
} }
}); });
string? label = null;
switch (binStart)
{
case 200_000:
case 400_000:
case 600_000:
case 800_000:
label = @$"{binStart / 1000}k";
break;
case 1_000_000:
label = @"1M";
break;
}
if (label != null) if (label != null)
{ {
AddInternal(new OsuSpriteText AddInternal(new OsuSpriteText
{ {
Anchor = Anchor.BottomLeft, Anchor = Anchor.BottomLeft,
Origin = Anchor.BottomCentre, Origin = Anchor.BottomCentre,
Text = label.Value, Text = label,
Colour = colourProvider.Content2, Colour = colourProvider.Content2,
}); });
} }
@ -189,6 +192,8 @@ namespace osu.Game.Screens.OnlinePlay.DailyChallenge
if (isIncrement) if (isIncrement)
CircularBar.FlashColour(Colour4.White, 600, Easing.OutQuint); CircularBar.FlashColour(Colour4.White, 600, Easing.OutQuint);
} }
public LocalisableString TooltipText => LocalisableString.Format("{0:N0} passes in {1:N0} - {2:N0} range", count, binStart, binEnd);
} }
} }
} }