From dde2ac7f4aeded50426cab429423fb969ea6b5e3 Mon Sep 17 00:00:00 2001 From: smoogipooo Date: Fri, 17 Mar 2017 22:03:47 +0900 Subject: [PATCH 1/2] Make TextAwesome have a shadow. --- osu.Game/Graphics/TextAwesome.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/osu.Game/Graphics/TextAwesome.cs b/osu.Game/Graphics/TextAwesome.cs index 45f9ddeec9..1bae165e45 100644 --- a/osu.Game/Graphics/TextAwesome.cs +++ b/osu.Game/Graphics/TextAwesome.cs @@ -1,11 +1,11 @@ // Copyright (c) 2007-2017 ppy Pty Ltd . // Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE -using osu.Framework.Graphics.Sprites; +using osu.Game.Graphics.Sprites; namespace osu.Game.Graphics { - public class TextAwesome : SpriteText + public class TextAwesome : OsuSpriteText { //public override FontFace FontFace => (int)Icon < 0xf000 ? FontFace.OsuFont : FontFace.FontAwesome; From d27f37beb5fe9f923b9e6028b94242c48653f3a2 Mon Sep 17 00:00:00 2001 From: smoogipooo Date: Mon, 20 Mar 2017 13:48:06 +0900 Subject: [PATCH 2/2] Hard-code text size in cases it wasn't set. --- osu.Desktop/Overlays/VersionManager.cs | 1 + osu.Game/Graphics/UserInterface/OsuDropDownHeader.cs | 1 + osu.Game/Modes/UI/ModIcon.cs | 2 ++ osu.Game/Overlays/Notifications/Notification.cs | 1 + osu.Game/Overlays/Notifications/SimpleNotification.cs | 1 + osu.Game/Overlays/Options/OptionsFooter.cs | 1 + osu.Game/Overlays/Options/SidebarButton.cs | 1 + osu.Game/Overlays/Toolbar/ToolbarButton.cs | 1 + osu.Game/Screens/Select/BeatmapInfoWedge.cs | 6 ++++-- osu.Game/Screens/Select/SearchTextBox.cs | 1 + 10 files changed, 14 insertions(+), 2 deletions(-) diff --git a/osu.Desktop/Overlays/VersionManager.cs b/osu.Desktop/Overlays/VersionManager.cs index b93636331a..70925f6cf4 100644 --- a/osu.Desktop/Overlays/VersionManager.cs +++ b/osu.Desktop/Overlays/VersionManager.cs @@ -215,6 +215,7 @@ namespace osu.Desktop.Overlays Origin = Anchor.Centre, Icon = FontAwesome.fa_upload, Colour = Color4.White, + TextSize = 20 } }); } diff --git a/osu.Game/Graphics/UserInterface/OsuDropDownHeader.cs b/osu.Game/Graphics/UserInterface/OsuDropDownHeader.cs index 00dc510338..559ffca283 100644 --- a/osu.Game/Graphics/UserInterface/OsuDropDownHeader.cs +++ b/osu.Game/Graphics/UserInterface/OsuDropDownHeader.cs @@ -54,6 +54,7 @@ namespace osu.Game.Graphics.UserInterface Anchor = Anchor.CentreRight, Origin = Anchor.CentreRight, Margin = new MarginPadding { Right = 4 }, + TextSize = 20 } }; } diff --git a/osu.Game/Modes/UI/ModIcon.cs b/osu.Game/Modes/UI/ModIcon.cs index b1017a670e..65a570fea7 100644 --- a/osu.Game/Modes/UI/ModIcon.cs +++ b/osu.Game/Modes/UI/ModIcon.cs @@ -66,12 +66,14 @@ namespace osu.Game.Modes.UI Anchor = Anchor.Centre, Icon = FontAwesome.fa_osu_mod_bg, Shadow = true, + TextSize = 20 }, modIcon = new TextAwesome { Origin = Anchor.Centre, Anchor = Anchor.Centre, Colour = OsuColour.Gray(84), + TextSize = 20 }, }; diff --git a/osu.Game/Overlays/Notifications/Notification.cs b/osu.Game/Overlays/Notifications/Notification.cs index ea07d7806a..e003a0e9dd 100644 --- a/osu.Game/Overlays/Notifications/Notification.cs +++ b/osu.Game/Overlays/Notifications/Notification.cs @@ -169,6 +169,7 @@ namespace osu.Game.Overlays.Notifications Anchor = Anchor.Centre, Origin = Anchor.Centre, Icon = FontAwesome.fa_times_circle, + TextSize = 20 } }; } diff --git a/osu.Game/Overlays/Notifications/SimpleNotification.cs b/osu.Game/Overlays/Notifications/SimpleNotification.cs index b06994d61a..19034d6d1c 100644 --- a/osu.Game/Overlays/Notifications/SimpleNotification.cs +++ b/osu.Game/Overlays/Notifications/SimpleNotification.cs @@ -53,6 +53,7 @@ namespace osu.Game.Overlays.Notifications Anchor = Anchor.Centre, Origin = Anchor.Centre, Icon = icon, + TextSize = 20 } }); diff --git a/osu.Game/Overlays/Options/OptionsFooter.cs b/osu.Game/Overlays/Options/OptionsFooter.cs index 23622aef08..c42fe42428 100644 --- a/osu.Game/Overlays/Options/OptionsFooter.cs +++ b/osu.Game/Overlays/Options/OptionsFooter.cs @@ -32,6 +32,7 @@ namespace osu.Game.Overlays.Options { Icon = Ruleset.GetRuleset(m).Icon, Colour = Color4.Gray, + TextSize = 20 }); Children = new Drawable[] diff --git a/osu.Game/Overlays/Options/SidebarButton.cs b/osu.Game/Overlays/Options/SidebarButton.cs index 83c2227763..729a9be326 100644 --- a/osu.Game/Overlays/Options/SidebarButton.cs +++ b/osu.Game/Overlays/Options/SidebarButton.cs @@ -87,6 +87,7 @@ namespace osu.Game.Overlays.Options { Anchor = Anchor.Centre, Origin = Anchor.Centre, + TextSize = 20 }, } }, diff --git a/osu.Game/Overlays/Toolbar/ToolbarButton.cs b/osu.Game/Overlays/Toolbar/ToolbarButton.cs index 17cef48f38..be4a23722f 100644 --- a/osu.Game/Overlays/Toolbar/ToolbarButton.cs +++ b/osu.Game/Overlays/Toolbar/ToolbarButton.cs @@ -98,6 +98,7 @@ namespace osu.Game.Overlays.Toolbar { Anchor = Anchor.Centre, Origin = Anchor.Centre, + TextSize = 20 }, DrawableText = new OsuSpriteText { diff --git a/osu.Game/Screens/Select/BeatmapInfoWedge.cs b/osu.Game/Screens/Select/BeatmapInfoWedge.cs index 5285d26264..d0805c19bd 100644 --- a/osu.Game/Screens/Select/BeatmapInfoWedge.cs +++ b/osu.Game/Screens/Select/BeatmapInfoWedge.cs @@ -237,14 +237,16 @@ namespace osu.Game.Screens.Select Icon = FontAwesome.fa_square, Origin = Anchor.Centre, Colour = new Color4(68, 17, 136, 255), - Rotation = 45 + Rotation = 45, + TextSize = 20 }, new TextAwesome { Icon = statistic.Icon, Origin = Anchor.Centre, Colour = new Color4(255, 221, 85, 255), - Scale = new Vector2(0.8f) + Scale = new Vector2(0.8f), + TextSize = 20 }, new OsuSpriteText { diff --git a/osu.Game/Screens/Select/SearchTextBox.cs b/osu.Game/Screens/Select/SearchTextBox.cs index bb1edfd0d7..4f2ab221cb 100644 --- a/osu.Game/Screens/Select/SearchTextBox.cs +++ b/osu.Game/Screens/Select/SearchTextBox.cs @@ -26,6 +26,7 @@ namespace osu.Game.Screens.Select Origin = Anchor.CentreRight, Anchor = Anchor.CentreRight, Margin = new MarginPadding { Right = 10 }, + TextSize = 20 } });