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

@ -21,7 +21,7 @@ namespace osu.Game.Screens.Select.Options
private readonly Box background;
private readonly Box flash;
private readonly TextAwesome iconText;
private readonly SpriteIcon iconText;
private readonly OsuSpriteText firstLine;
private readonly OsuSpriteText secondLine;
private readonly Container box;
@ -134,11 +134,11 @@ namespace osu.Game.Screens.Select.Options
Direction = FillDirection.Vertical,
Children = new Drawable[]
{
iconText = new TextAwesome
iconText = new SpriteIcon
{
Origin = Anchor.TopCentre,
Anchor = Anchor.TopCentre,
TextSize = 30,
Size = new Vector2(30),
Shadow = true,
Icon = FontAwesome.fa_close,
Margin = new MarginPadding