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

Combine other cases of displaying dash in scores PP

Browse Source
This commit is contained in:
Salman Ahmed 2024-02-12 12:29:31 +03:00
parent 706a16677c
commit 2ae616a88e
4 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
osu.Game/Overlays/BeatmapSet/Scores/ScoreTable.cs
View File

@ -181,7 +181,7 @@ namespace osu.Game.Overlays.BeatmapSet.Scores
if (showPerformancePoints) if (showPerformancePoints)
{ {
if (!score.Ranked) if (!score.Ranked)
content.Add(new UnrankedPerformancePointsPlaceholder { Font = OsuFont.GetFont(size: text_size) }); content.Add(new UnrankedPerformancePointsPlaceholder(ScoresStrings.StatusNoPp) { Font = OsuFont.GetFont(size: text_size) });
else if (score.PP == null) else if (score.PP == null)
content.Add(new UnprocessedPerformancePointsPlaceholder { Size = new Vector2(text_size) }); content.Add(new UnprocessedPerformancePointsPlaceholder { Size = new Vector2(text_size) });
else else

2
osu.Game/Overlays/BeatmapSet/Scores/TopScoreStatisticsSection.cs
View File

@ -126,7 +126,7 @@ namespace osu.Game.Overlays.BeatmapSet.Scores
ppColumn.Alpha = value.BeatmapInfo!.Status.GrantsPerformancePoints() ? 1 : 0; ppColumn.Alpha = value.BeatmapInfo!.Status.GrantsPerformancePoints() ? 1 : 0;
if (!value.Ranked) if (!value.Ranked)
ppColumn.Drawable = new UnrankedPerformancePointsPlaceholder { Font = smallFont }; ppColumn.Drawable = new UnrankedPerformancePointsPlaceholder(ScoresStrings.StatusNoPp) { Font = smallFont };
else if (value.PP is not double pp) else if (value.PP is not double pp)
ppColumn.Drawable = new UnprocessedPerformancePointsPlaceholder { Size = new Vector2(smallFont.Size) }; ppColumn.Drawable = new UnprocessedPerformancePointsPlaceholder { Size = new Vector2(smallFont.Size) };
else else

10
osu.Game/Overlays/Profile/Sections/Ranks/DrawableProfileScore.cs
View File

@ -14,6 +14,7 @@ using osu.Game.Graphics;
using osu.Game.Graphics.Sprites; using osu.Game.Graphics.Sprites;
using osu.Game.Online.API.Requests.Responses; using osu.Game.Online.API.Requests.Responses;
using osu.Game.Online.Leaderboards; using osu.Game.Online.Leaderboards;
using osu.Game.Resources.Localisation.Web;
using osu.Game.Rulesets; using osu.Game.Rulesets;
using osu.Game.Rulesets.Mods; using osu.Game.Rulesets.Mods;
using osu.Game.Rulesets.UI; using osu.Game.Rulesets.UI;
@ -243,20 +244,19 @@ namespace osu.Game.Overlays.Profile.Sections.Ranks
if (Score.Beatmap?.Status.GrantsPerformancePoints() != true) if (Score.Beatmap?.Status.GrantsPerformancePoints() != true)
{ {
return new OsuSpriteText return new UnrankedPerformancePointsPlaceholder(UsersStrings.ShowExtraTopRanksNotRanked)
{ {
Font = OsuFont.GetFont(weight: FontWeight.Bold), Font = OsuFont.GetFont(weight: FontWeight.Bold),
Text = "-", Colour = colourProvider.Highlight1,
Colour = colourProvider.Highlight1
}; };
} }
if (!Score.Ranked) if (!Score.Ranked)
{ {
return new UnrankedPerformancePointsPlaceholder return new UnrankedPerformancePointsPlaceholder(ScoresStrings.StatusNoPp)
{ {
Font = OsuFont.GetFont(weight: FontWeight.Bold), Font = OsuFont.GetFont(weight: FontWeight.Bold),
Colour = colourProvider.Highlight1 Colour = colourProvider.Highlight1,
}; };
} }

8
osu.Game/Scoring/Drawables/UnrankedPerformancePointsPlaceholder.cs
View File

@ -5,22 +5,22 @@ using osu.Framework.Graphics;
using osu.Framework.Graphics.Cursor; using osu.Framework.Graphics.Cursor;
using osu.Framework.Graphics.Sprites; using osu.Framework.Graphics.Sprites;
using osu.Framework.Localisation; using osu.Framework.Localisation;
using osu.Game.Resources.Localisation.Web;
namespace osu.Game.Scoring.Drawables namespace osu.Game.Scoring.Drawables
{ {
/// <summary> /// <summary>
/// A placeholder used in PP columns for scores that do not award PP. /// A placeholder used in PP columns for scores that do not award PP due to a reason specified by <see cref="TooltipText"/>.
/// </summary> /// </summary>
public partial class UnrankedPerformancePointsPlaceholder : SpriteText, IHasTooltip public partial class UnrankedPerformancePointsPlaceholder : SpriteText, IHasTooltip
{ {
public LocalisableString TooltipText => ScoresStrings.StatusNoPp; public LocalisableString TooltipText { get; }
public UnrankedPerformancePointsPlaceholder() public UnrankedPerformancePointsPlaceholder(LocalisableString tooltipText)
{ {
Anchor = Anchor.Centre; Anchor = Anchor.Centre;
Origin = Anchor.Centre; Origin = Anchor.Centre;
Text = "-"; Text = "-";
TooltipText = tooltipText;
} }
} }
} }