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

Allow null in mod list to generate a placeholder ModButton.

Browse Source
This commit is contained in:
Huo Yaoyuan 2017-03-07 19:52:51 +08:00
parent ffd79bee06
commit b19405c987
1 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -54,7 +54,8 @@ namespace osu.Game.Overlays.Mods
iconsContainer.ScaleTo(Selected ? 1.1f : 1f, 300, EasingTypes.OutElastic); iconsContainer.ScaleTo(Selected ? 1.1f : 1f, 300, EasingTypes.OutElastic);
foregroundIcon.Colour = Selected ? SelectedColour : ButtonColour; foregroundIcon.Colour = Selected ? SelectedColour : ButtonColour;
displaySelectedMod(); if (mod != null)
displayMod(SelectedMod ?? Mods[0]);
} }
} }
@ -102,10 +103,18 @@ namespace osu.Game.Overlays.Mods
} }
set set
{ {
if (mod == value) return;
mod = value; mod = value;
Mods = (mod as MultiMod)?.Mods ?? new[] { mod }; if (mod == null)
{
Mods = new Mod[0];
Alpha = 0;
}
else
{
Mods = (mod as MultiMod)?.Mods ?? new[] { mod };
Alpha = 1;
}
createIcons(); createIcons();
if (Mods.Length > 0) if (Mods.Length > 0)
@ -165,8 +174,6 @@ namespace osu.Game.Overlays.Mods
text.Text = mod.Name; text.Text = mod.Name;
} }
private void displaySelectedMod() => displayMod(SelectedMod ?? Mods[0]);
private void createIcons() private void createIcons()
{ {
iconsContainer.Clear(); iconsContainer.Clear();
@ -216,6 +223,7 @@ namespace osu.Game.Overlays.Mods
Direction = FillDirection.Vertical; Direction = FillDirection.Vertical;
Spacing = new Vector2(0f, -5f); Spacing = new Vector2(0f, -5f);
Size = new Vector2(100f); Size = new Vector2(100f);
AlwaysPresent = true;
Children = new Drawable[] Children = new Drawable[]
{ {