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

Nullability

Browse Source
This commit is contained in:
Dean Herbert 2024-01-25 21:16:12 +09:00
parent 3c18efed05
commit aeac0a2a9d
No known key found for this signature in database
1 changed files with 18 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
osu.Game/Beatmaps/Drawables/DifficultyIconTooltip.cs
View File

@ -1,8 +1,6 @@
// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence. // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
// See the LICENCE file in the repository root for full licence text. // See the LICENCE file in the repository root for full licence text.
#nullable disable
using System; using System;
using System.Linq; using System.Linq;
using osu.Framework.Allocation; using osu.Framework.Allocation;
@ -21,17 +19,17 @@ namespace osu.Game.Beatmaps.Drawables
{ {
internal partial class DifficultyIconTooltip : VisibilityContainer, ITooltip<DifficultyIconTooltipContent> internal partial class DifficultyIconTooltip : VisibilityContainer, ITooltip<DifficultyIconTooltipContent>
{ {
private OsuSpriteText difficultyName; private OsuSpriteText difficultyName = null!;
private StarRatingDisplay starRating; private StarRatingDisplay starRating = null!;
private OsuSpriteText overallDifficulty; private OsuSpriteText overallDifficulty = null!;
private OsuSpriteText drainRate; private OsuSpriteText drainRate = null!;
private OsuSpriteText circleSize; private OsuSpriteText circleSize = null!;
private OsuSpriteText approachRate; private OsuSpriteText approachRate = null!;
private OsuSpriteText bpm; private OsuSpriteText bpm = null!;
private OsuSpriteText length; private OsuSpriteText length = null!;
private FillFlowContainer difficultyFillFlowContainer; private FillFlowContainer difficultyFillFlowContainer = null!;
private FillFlowContainer miscFillFlowContainer; private FillFlowContainer miscFillFlowContainer = null!;
[BackgroundDependencyLoader] [BackgroundDependencyLoader]
private void load(OsuColour colours) private void load(OsuColour colours)
@ -133,7 +131,7 @@ namespace osu.Game.Beatmaps.Drawables
}; };
} }
private DifficultyIconTooltipContent displayedContent; private DifficultyIconTooltipContent? displayedContent;
public void SetContent(DifficultyIconTooltipContent content) public void SetContent(DifficultyIconTooltipContent content)
{ {
@ -178,12 +176,12 @@ namespace osu.Game.Beatmaps.Drawables
Ruleset ruleset = displayedContent.Ruleset.CreateInstance(); Ruleset ruleset = displayedContent.Ruleset.CreateInstance();
BeatmapDifficulty adjustedDifficulty = ruleset.GetRateAdjustedDisplayDifficulty(originalDifficulty, rate); BeatmapDifficulty adjustedDifficulty = ruleset.GetRateAdjustedDisplayDifficulty(originalDifficulty, rate);
circleSize.Text = "CS: " + adjustedDifficulty.CircleSize.ToString("0.##"); circleSize.Text = @"CS: " + adjustedDifficulty.CircleSize.ToString(@"0.##");
drainRate.Text = " HP: " + adjustedDifficulty.DrainRate.ToString("0.##"); drainRate.Text = @" HP: " + adjustedDifficulty.DrainRate.ToString(@"0.##");
approachRate.Text = " AR: " + adjustedDifficulty.ApproachRate.ToString("0.##"); approachRate.Text = @" AR: " + adjustedDifficulty.ApproachRate.ToString(@"0.##");
overallDifficulty.Text = " OD: " + adjustedDifficulty.OverallDifficulty.ToString("0.##"); overallDifficulty.Text = @" OD: " + adjustedDifficulty.OverallDifficulty.ToString(@"0.##");
length.Text = "Length: " + TimeSpan.FromMilliseconds(displayedContent.BeatmapInfo.Length / rate).ToString("mm\\:ss"); length.Text = "Length: " + TimeSpan.FromMilliseconds(displayedContent.BeatmapInfo.Length / rate).ToString(@"mm\:ss");
bpm.Text = " BPM: " + Math.Round(bpmAdjusted, 0); bpm.Text = " BPM: " + Math.Round(bpmAdjusted, 0);
} }
@ -199,10 +197,10 @@ namespace osu.Game.Beatmaps.Drawables
public readonly IBeatmapInfo BeatmapInfo; public readonly IBeatmapInfo BeatmapInfo;
public readonly IBindable<StarDifficulty> Difficulty; public readonly IBindable<StarDifficulty> Difficulty;
public readonly IRulesetInfo Ruleset; public readonly IRulesetInfo Ruleset;
public readonly Mod[] Mods; public readonly Mod[]? Mods;
public readonly bool ShowExtendedTooltip; public readonly bool ShowExtendedTooltip;
public DifficultyIconTooltipContent(IBeatmapInfo beatmapInfo, IBindable<StarDifficulty> difficulty, IRulesetInfo rulesetInfo, Mod[] mods, bool showExtendedTooltip = false) public DifficultyIconTooltipContent(IBeatmapInfo beatmapInfo, IBindable<StarDifficulty> difficulty, IRulesetInfo rulesetInfo, Mod[]? mods, bool showExtendedTooltip = false)
{ {
BeatmapInfo = beatmapInfo; BeatmapInfo = beatmapInfo;
Difficulty = difficulty; Difficulty = difficulty;