From 67105e6dfd4f9f61531be0a382bd2842d7927f6e Mon Sep 17 00:00:00 2001 From: Dean Herbert Date: Wed, 15 Feb 2017 21:37:43 +0900 Subject: [PATCH] Replace all usage of SpriteText with OsuSpriteText. --- osu.Game.Modes.Osu/Objects/Drawables/HitExplosion.cs | 5 +++-- .../Overlays/Notifications/ProgressNotification.cs | 3 ++- osu.Game/Overlays/Notifications/SimpleNotification.cs | 3 ++- osu.Game/Overlays/Pause/PauseButton.cs | 3 ++- osu.Game/Overlays/Pause/PauseOverlay.cs | 11 ++++++----- osu.Game/Screens/Select/FilterControl.cs | 5 +++-- 6 files changed, 18 insertions(+), 12 deletions(-) diff --git a/osu.Game.Modes.Osu/Objects/Drawables/HitExplosion.cs b/osu.Game.Modes.Osu/Objects/Drawables/HitExplosion.cs index 1a92436d74..4176e556d4 100644 --- a/osu.Game.Modes.Osu/Objects/Drawables/HitExplosion.cs +++ b/osu.Game.Modes.Osu/Objects/Drawables/HitExplosion.cs @@ -6,6 +6,7 @@ using osu.Framework.Graphics; using osu.Framework.Graphics.Containers; using osu.Framework.Graphics.Sprites; using osu.Framework.Graphics.Transformations; +using osu.Game.Graphics.Sprites; using osu.Game.Modes.Objects.Drawables; using OpenTK; using OpenTK.Graphics; @@ -30,7 +31,7 @@ namespace osu.Game.Modes.Osu.Objects.Drawables Children = new Drawable[] { - line1 = new SpriteText + line1 = new OsuSpriteText { Anchor = Anchor.TopCentre, Origin = Anchor.TopCentre, @@ -38,7 +39,7 @@ namespace osu.Game.Modes.Osu.Objects.Drawables Font = @"Venera", TextSize = 16, }, - line2 = new SpriteText + line2 = new OsuSpriteText { Text = judgement.Combo.GetDescription(), Font = @"Venera", diff --git a/osu.Game/Overlays/Notifications/ProgressNotification.cs b/osu.Game/Overlays/Notifications/ProgressNotification.cs index 8b0fc27d36..28a0d8a0af 100644 --- a/osu.Game/Overlays/Notifications/ProgressNotification.cs +++ b/osu.Game/Overlays/Notifications/ProgressNotification.cs @@ -9,6 +9,7 @@ using osu.Framework.Graphics.Containers; using osu.Framework.Graphics.Sprites; using osu.Framework.Graphics.Transformations; using osu.Game.Graphics; +using osu.Game.Graphics.Sprites; using OpenTK; using OpenTK.Graphics; @@ -118,7 +119,7 @@ namespace osu.Game.Overlays.Notifications RelativeSizeAxes = Axes.Both, }); - Content.Add(textDrawable = new SpriteText + Content.Add(textDrawable = new OsuSpriteText { TextSize = 16, Colour = OsuColour.Gray(128), diff --git a/osu.Game/Overlays/Notifications/SimpleNotification.cs b/osu.Game/Overlays/Notifications/SimpleNotification.cs index cf16978c3e..24f347eee3 100644 --- a/osu.Game/Overlays/Notifications/SimpleNotification.cs +++ b/osu.Game/Overlays/Notifications/SimpleNotification.cs @@ -6,6 +6,7 @@ using osu.Framework.Graphics; using osu.Framework.Graphics.Colour; using osu.Framework.Graphics.Sprites; using osu.Game.Graphics; +using osu.Game.Graphics.Sprites; namespace osu.Game.Overlays.Notifications { @@ -52,7 +53,7 @@ namespace osu.Game.Overlays.Notifications } }); - Content.Add(textDrawable = new SpriteText + Content.Add(textDrawable = new OsuSpriteText { TextSize = 16, Colour = OsuColour.Gray(128), diff --git a/osu.Game/Overlays/Pause/PauseButton.cs b/osu.Game/Overlays/Pause/PauseButton.cs index 03b4a2a09f..1a1ba4f527 100644 --- a/osu.Game/Overlays/Pause/PauseButton.cs +++ b/osu.Game/Overlays/Pause/PauseButton.cs @@ -11,6 +11,7 @@ using osu.Framework.Graphics.Containers; using osu.Framework.Audio.Sample; using osu.Game.Graphics; using osu.Game.Graphics.Backgrounds; +using osu.Game.Graphics.Sprites; namespace osu.Game.Overlays.Pause { @@ -224,7 +225,7 @@ namespace osu.Game.Overlays.Pause } } }, - spriteText = new SpriteText + spriteText = new OsuSpriteText { Text = Text, Anchor = Anchor.Centre, diff --git a/osu.Game/Overlays/Pause/PauseOverlay.cs b/osu.Game/Overlays/Pause/PauseOverlay.cs index 65eb5154a6..a915fe91dd 100644 --- a/osu.Game/Overlays/Pause/PauseOverlay.cs +++ b/osu.Game/Overlays/Pause/PauseOverlay.cs @@ -13,6 +13,7 @@ using osu.Framework.Graphics.Sprites; using osu.Framework.Graphics.Containers; using osu.Framework.Graphics.Transformations; using System.Threading.Tasks; +using osu.Game.Graphics.Sprites; namespace osu.Game.Overlays.Pause { @@ -39,14 +40,14 @@ namespace osu.Game.Overlays.Pause retryCounterContainer.Children = new Drawable[] { - new SpriteText + new OsuSpriteText { Text = "You've retried ", Shadow = true, ShadowColour = new Color4(0, 0, 0, 0.25f), TextSize = 18 }, - new SpriteText + new OsuSpriteText { Text = String.Format("{0:n0}", value), Font = @"Exo2.0-Bold", @@ -54,7 +55,7 @@ namespace osu.Game.Overlays.Pause ShadowColour = new Color4(0, 0, 0, 0.25f), TextSize = 18 }, - new SpriteText + new OsuSpriteText { Text = $" time{((value == 1) ? "" : "s")} in this session", Shadow = true, @@ -119,7 +120,7 @@ namespace osu.Game.Overlays.Pause Anchor = Anchor.TopCentre, Children = new Drawable[] { - new SpriteText + new OsuSpriteText { Text = @"paused", Font = @"Exo2.0-Medium", @@ -131,7 +132,7 @@ namespace osu.Game.Overlays.Pause Shadow = true, ShadowColour = new Color4(0, 0, 0, 0.25f) }, - new SpriteText + new OsuSpriteText { Text = @"you're not going to do what i think you're going to do, are ya?", Origin = Anchor.TopCentre, diff --git a/osu.Game/Screens/Select/FilterControl.cs b/osu.Game/Screens/Select/FilterControl.cs index 512fa22b3a..975a3f9ca3 100644 --- a/osu.Game/Screens/Select/FilterControl.cs +++ b/osu.Game/Screens/Select/FilterControl.cs @@ -12,6 +12,7 @@ using osu.Framework.Graphics.Sprites; using osu.Framework.Graphics.UserInterface; using osu.Framework.Input; using osu.Game.Graphics; +using osu.Game.Graphics.Sprites; namespace osu.Game.Screens.Select { @@ -127,7 +128,7 @@ namespace osu.Game.Screens.Select AutoSizeAxes = Axes.Both; Children = new Drawable[] { - text = new SpriteText + text = new OsuSpriteText { Margin = new MarginPadding(5), TextSize = 14, @@ -213,7 +214,7 @@ namespace osu.Game.Screens.Select Anchor = Anchor.TopRight, Children = new Drawable[] { - sortLabel = new SpriteText + sortLabel = new OsuSpriteText { Font = @"Exo2.0-Bold", Text = "Sort results by",