h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2026-06-03 17:23:57 +08:00
Code Issues Releases Wiki Activity

Merge pull request #1669 from ninjaprawn/master

Browse Source 
Display the correct mod tooltips in mod selection
This commit is contained in:
Dan Balasescu
2017-12-30 17:06:00 +09:00
committed by GitHub
Unverified
parent e6d79fbc66 616ad5b723
commit d8e6ff79f7
3 changed files with 14 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
osu-framework
+1 -1
Submodule osu-framework updated: 2438afea86...0c48da1d49
osu.Game/Overlays/Mods/ModButton.cs
+12 -3
View File
@@ -204,13 +204,13 @@ namespace osu.Game.Overlays.Mods
{
iconsContainer.AddRange(new[]
{
backgroundIcon = new ModIcon(Mods[1])
backgroundIcon = new PassThroughTooltipModIcon(Mods[1])
{
Origin = Anchor.BottomRight,
Anchor = Anchor.BottomRight,
Position = new Vector2(1.5f),
},
foregroundIcon = new ModIcon(Mods[0])
foregroundIcon = new PassThroughTooltipModIcon(Mods[0])
{
Origin = Anchor.BottomRight,
Anchor = Anchor.BottomRight,
@@ -220,7 +220,7 @@ namespace osu.Game.Overlays.Mods
}
else
{
iconsContainer.Add(foregroundIcon = new ModIcon(Mod)
iconsContainer.Add(foregroundIcon = new PassThroughTooltipModIcon(Mod)
{
Origin = Anchor.Centre,
Anchor = Anchor.Centre,
@@ -259,5 +259,14 @@ namespace osu.Game.Overlays.Mods
Mod = mod;
}
private class PassThroughTooltipModIcon : ModIcon
{
public override string TooltipText => null;
public PassThroughTooltipModIcon(Mod mod) : base(mod)
{
}
}
}
}
osu.Game/Rulesets/UI/ModIcon.cs
+1 -1
View File
@@ -28,7 +28,7 @@ namespace osu.Game.Rulesets.UI
private readonly ModType type;
public string TooltipText { get; }
public virtual string TooltipText { get; }
public ModIcon(Mod mod)
{