diff --git a/osu-resources b/osu-resources index 7ad9b5fcb0..d7f9eb2500 160000 --- a/osu-resources +++ b/osu-resources @@ -1 +1 @@ -Subproject commit 7ad9b5fcb00d5886792314847f88cee082421a4b +Subproject commit d7f9eb25006b2ad0579ed1ef8983a44b5c0e1de2 diff --git a/osu.Game/GameModes/Menu/ButtonSystem.cs b/osu.Game/GameModes/Menu/ButtonSystem.cs index 24ccba839a..5798e8b5c9 100644 --- a/osu.Game/GameModes/Menu/ButtonSystem.cs +++ b/osu.Game/GameModes/Menu/ButtonSystem.cs @@ -444,13 +444,19 @@ namespace osu.Game.GameModes.Menu Origin = Anchor.Centre, Children = new Drawable[] { - icon = new TextAwesome(symbol, 40, Vector2.Zero), + icon = new TextAwesome + { + Anchor = Anchor.Centre, + TextSize = 40, + Position = new Vector2(0, 0), + Icon = symbol + }, new SpriteText { Direction = FlowDirection.HorizontalOnly, Anchor = Anchor.Centre, Origin = Anchor.Centre, - Position = new Vector2(0, 25), + Position = new Vector2(0, 35), Text = text } } diff --git a/osu.Game/Graphics/TextAwesome.cs b/osu.Game/Graphics/TextAwesome.cs index faf7cb2866..bfb49ee03f 100644 --- a/osu.Game/Graphics/TextAwesome.cs +++ b/osu.Game/Graphics/TextAwesome.cs @@ -28,11 +28,9 @@ namespace osu.Game.Graphics } } - internal TextAwesome(FontAwesome icon = FontAwesome.circle, float size = 10, Vector2? position = null) - : base(null) + public TextAwesome() { - Icon = icon; - Origin = osu.Framework.Graphics.Anchor.Centre; + Origin = Framework.Graphics.Anchor.Centre; } } diff --git a/osu.Game/OsuGame.cs b/osu.Game/OsuGame.cs index b1aeaa0a2d..2803f6ddb9 100644 --- a/osu.Game/OsuGame.cs +++ b/osu.Game/OsuGame.cs @@ -37,7 +37,11 @@ namespace osu.Game base.Load(); //this completely overrides the framework default. will need to change once we make a proper FontStore. - Fonts = new TextureStore(new GlyphStore(Resources, @"Fonts/Exo2.0-Regular")) { ScaleAdjust = 0.01f }; + Fonts = new TextureStore() { ScaleAdjust = 0.01f }; + Fonts.AddStore(new GlyphStore(Resources, @"Fonts/Exo2.0-Regular")); + Fonts.AddStore(new GlyphStore(Resources, @"Fonts/FontAwesome")); + Fonts.AddStore(new GlyphStore(Resources, @"Fonts/osuFont")); + API = new APIAccess() {