h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2024-09-22 01:27:29 +08:00
Code Issues Releases Wiki Activity

Move ModIcon tooltip to base implementation

Browse Source
This commit is contained in:
Dean Herbert 2017-10-13 19:14:43 +09:00
parent 146d800bda
commit ead88224c5
2 changed files with 7 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
osu.Game/Overlays/Profile/Sections/Ranks/DrawableScore.cs
View File

@ -16,8 +16,8 @@ using System.Diagnostics;
using osu.Framework.Localisation;
using System.Globalization;
using osu.Game.Rulesets.Scoring;
using osu.Framework.Graphics.Cursor;
using System;
using osu.Game.Rulesets.UI;
namespace osu.Game.Overlays.Profile.Sections.Ranks
{
@ -158,16 +158,5 @@ namespace osu.Game.Overlays.Profile.Sections.Ranks
yield return new Vector2(DrawWidth * i * (count == 1 ? 0 : 1f / (count - 1)), 0);
}
}
private class ModIcon : Rulesets.UI.ModIcon, IHasTooltip
{
public ModIcon(Mod mod)
: base(mod)
{
TooltipText = mod.Name;
}
public string TooltipText { get; }
}
}
}

7
osu.Game/Rulesets/UI/ModIcon.cs
View File

@ -6,13 +6,14 @@ using OpenTK.Graphics;
using osu.Framework.Allocation;
using osu.Framework.Graphics;
using osu.Framework.Graphics.Containers;
using osu.Framework.Graphics.Cursor;
using osu.Game.Graphics;
using osu.Game.Rulesets.Mods;
using OpenTK;
namespace osu.Game.Rulesets.UI
{
public class ModIcon : Container
public class ModIcon : Container, IHasTooltip
{
private readonly SpriteIcon modIcon;
private readonly SpriteIcon background;
@ -27,12 +28,16 @@ namespace osu.Game.Rulesets.UI
private readonly ModType type;
public string TooltipText { get; }
public ModIcon(Mod mod)
{
if (mod == null) throw new ArgumentNullException(nameof(mod));
type = mod.Type;
TooltipText = mod.Name;
Children = new Drawable[]
{
background = new SpriteIcon