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

Merge branch 'refactor-difficulty-colours' into difficulty-icon-tooltip

Browse Source
This commit is contained in:
Dean Herbert
2019-08-17 15:18:27 +09:00
parent f552de6ebc 4fa9abeece
commit 3dc81bdad5
6 changed files with 72 additions and 94 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
osu.Game/Beatmaps/Drawables/DifficultyIcon.cs
View File

@ -19,16 +19,18 @@ using osuTK.Graphics;
namespace osu.Game.Beatmaps.Drawables
{
public class DifficultyIcon : DifficultyColouredContainer, IHasCustomTooltip
public class DifficultyIcon : Container, IHasCustomTooltip
{
private readonly BeatmapInfo beatmap;
private readonly RulesetInfo ruleset;
public DifficultyIcon(BeatmapInfo beatmap, RulesetInfo ruleset = null, bool shouldShowTooltip = true)
: base(beatmap)
{
if (beatmap == null)
throw new ArgumentNullException(nameof(beatmap));
this.beatmap = beatmap;
this.ruleset = ruleset ?? beatmap.Ruleset;
TooltipText = shouldShowTooltip ? $"{beatmap.Version}${beatmap.StarDifficulty:0.##}" : String.Empty;
@ -40,7 +42,7 @@ namespace osu.Game.Beatmaps.Drawables
public ITooltip GetCustomTooltip() => new DifficultyIconTooltip(AccentColour);
[BackgroundDependencyLoader]
private void load()
private void load(OsuColour colours)
{
Children = new Drawable[]
{
@ -60,7 +62,7 @@ namespace osu.Game.Beatmaps.Drawables
Child = new Box
{
RelativeSizeAxes = Axes.Both,
Colour = AccentColour,
Colour = colours.ForDifficultyRating(beatmap.DifficultyRating),
},
},
new ConstrainedIconContainer