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

Refactor ModSection and ModIcon to avoid null mods.

Browse Source
This commit is contained in:
Dean Herbert
2017-05-05 12:16:41 +09:00
parent 95f6c999bd
commit 6298b3effd
6 changed files with 76 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,6 +1,7 @@
// Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
using System;
using OpenTK.Graphics;
using osu.Framework.Graphics;
using osu.Framework.Graphics.Containers;
@ -42,6 +43,8 @@ namespace osu.Game.Rulesets.UI
public ModIcon(Mod mod)
{
if (mod == null) throw new ArgumentNullException(nameof(mod));
Children = new Drawable[]
{
background = new TextAwesome
@ -59,7 +62,7 @@ namespace osu.Game.Rulesets.UI
Anchor = Anchor.Centre,
Colour = OsuColour.Gray(84),
TextSize = 20,
Icon = (mod != null) ? mod.Icon : FontAwesome.fa_question,
Icon = mod.Icon
},
};
@ -74,7 +77,7 @@ namespace osu.Game.Rulesets.UI
private Color4 getBackgroundColourFromMod(Mod mod)
{
switch (mod?.Type)
switch (mod.Type)
{
case ModType.DifficultyIncrease:
return OsuColour.FromHex(@"ffcc22");
@ -87,4 +90,4 @@ namespace osu.Game.Rulesets.UI
}
}
}
}
}