Allow Rulesets to create a non-FontAwesome icon

This also
- Renames TextAwesome to SpriteIcon.
- Removes the default size of "20" from SpriteIcon (now defaults to the underlying texture size).
This commit is contained in:
Dean Herbert
2017-08-03 14:36:21 +09:00
parent d72a479d9d
commit 0d9ea97828
55 changed files with 317 additions and 187 deletions

View File

@ -6,6 +6,7 @@ using osu.Framework.Allocation;
using osu.Framework.Graphics;
using osu.Framework.Graphics.Containers;
using osu.Game.Graphics;
using osu.Game.Graphics.Containers;
using osu.Game.Graphics.Sprites;
using osu.Game.Rulesets;
using OpenTK;
@ -27,12 +28,14 @@ namespace osu.Game.Overlays.Settings
foreach (var ruleset in rulesets.AllRulesets)
{
modes.Add(new TextAwesome
var icon = new ConstrainedIconContainer
{
Icon = ruleset.CreateInstance().Icon,
Icon = ruleset.CreateInstance().CreateIcon(),
Colour = Color4.Gray,
TextSize = 20
});
Size = new Vector2(20),
};
modes.Add(icon);
}
Children = new Drawable[]