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

Adjust visuals of incompatible icon and move to own class

Browse Source
This commit is contained in:
Dean Herbert
2021-08-24 13:58:31 +09:00
parent bf0a1167ec
commit afd01d22d6
2 changed files with 72 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
osu.Game/Overlays/Mods/ModButton.cs
View File

@ -33,7 +33,7 @@ namespace osu.Game.Overlays.Mods
private ModIcon backgroundIcon;
private readonly SpriteText text;
private readonly Container<ModIcon> iconsContainer;
private readonly SpriteIcon incompatibleIcon;
private readonly CompositeDrawable incompatibleIcon;
/// <summary>
/// Fired when the selection changes.
@ -258,7 +258,10 @@ namespace osu.Game.Overlays.Mods
if (selectedMods.Value.Count > 0 && !selectedMods.Value.Contains(m))
isIncompatible = !ModUtils.CheckCompatibleSet(selectedMods.Value.Append(m));
incompatibleIcon.FadeTo(isIncompatible ? 1 : 0, 200, Easing.OutQuint);
if (isIncompatible)
incompatibleIcon.Show();
else
incompatibleIcon.Hide();
}
private void createIcons()
@ -315,15 +318,11 @@ namespace osu.Game.Overlays.Mods
Origin = Anchor.Centre,
Anchor = Anchor.Centre,
},
incompatibleIcon = new SpriteIcon
incompatibleIcon = new IncompatibleIcon
{
Origin = Anchor.BottomRight,
Origin = Anchor.Centre,
Anchor = Anchor.BottomRight,
Icon = FontAwesome.Solid.Ban,
Colour = Color4.Red,
Size = new Vector2(30),
Shadow = true,
Alpha = 0
Position = new Vector2(-13),
}
},
RelativeSizeAxes = Axes.Both,