sim1222/osukey
1
1
Fork 0
mirror of https://github.com/osukey/osukey.git synced 2025-07-01 16:29:58 +09:00
Code Issues Packages Projects Releases Wiki Activity

Replace all usage of SpriteText with OsuSpriteText.

Browse Source
This commit is contained in:
Dean Herbert
2017-02-15 21:37:43 +09:00
parent ce859196d5
commit 67105e6dfd
6 changed files with 18 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
osu.Game.Modes.Osu/Objects/Drawables/HitExplosion.cs
View File

@ -6,6 +6,7 @@ using osu.Framework.Graphics;
using osu.Framework.Graphics.Containers; using osu.Framework.Graphics.Containers;
using osu.Framework.Graphics.Sprites; using osu.Framework.Graphics.Sprites;
using osu.Framework.Graphics.Transformations; using osu.Framework.Graphics.Transformations;
using osu.Game.Graphics.Sprites;
using osu.Game.Modes.Objects.Drawables; using osu.Game.Modes.Objects.Drawables;
using OpenTK; using OpenTK;
using OpenTK.Graphics; using OpenTK.Graphics;
@ -30,7 +31,7 @@ namespace osu.Game.Modes.Osu.Objects.Drawables
Children = new Drawable[] Children = new Drawable[]
{ {
line1 = new SpriteText line1 = new OsuSpriteText
{ {
Anchor = Anchor.TopCentre, Anchor = Anchor.TopCentre,
Origin = Anchor.TopCentre, Origin = Anchor.TopCentre,
@ -38,7 +39,7 @@ namespace osu.Game.Modes.Osu.Objects.Drawables
Font = @"Venera", Font = @"Venera",
TextSize = 16, TextSize = 16,
}, },
line2 = new SpriteText line2 = new OsuSpriteText
{ {
Text = judgement.Combo.GetDescription(), Text = judgement.Combo.GetDescription(),
Font = @"Venera", Font = @"Venera",

3
osu.Game/Overlays/Notifications/ProgressNotification.cs
View File

@ -9,6 +9,7 @@ using osu.Framework.Graphics.Containers;
using osu.Framework.Graphics.Sprites; using osu.Framework.Graphics.Sprites;
using osu.Framework.Graphics.Transformations; using osu.Framework.Graphics.Transformations;
using osu.Game.Graphics; using osu.Game.Graphics;
using osu.Game.Graphics.Sprites;
using OpenTK; using OpenTK;
using OpenTK.Graphics; using OpenTK.Graphics;
@ -118,7 +119,7 @@ namespace osu.Game.Overlays.Notifications
RelativeSizeAxes = Axes.Both, RelativeSizeAxes = Axes.Both,
}); });
Content.Add(textDrawable = new SpriteText Content.Add(textDrawable = new OsuSpriteText
{ {
TextSize = 16, TextSize = 16,
Colour = OsuColour.Gray(128), Colour = OsuColour.Gray(128),

3
osu.Game/Overlays/Notifications/SimpleNotification.cs
View File

@ -6,6 +6,7 @@ using osu.Framework.Graphics;
using osu.Framework.Graphics.Colour; using osu.Framework.Graphics.Colour;
using osu.Framework.Graphics.Sprites; using osu.Framework.Graphics.Sprites;
using osu.Game.Graphics; using osu.Game.Graphics;
using osu.Game.Graphics.Sprites;
namespace osu.Game.Overlays.Notifications 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, TextSize = 16,
Colour = OsuColour.Gray(128), Colour = OsuColour.Gray(128),

3
osu.Game/Overlays/Pause/PauseButton.cs
View File

@ -11,6 +11,7 @@ using osu.Framework.Graphics.Containers;
using osu.Framework.Audio.Sample; using osu.Framework.Audio.Sample;
using osu.Game.Graphics; using osu.Game.Graphics;
using osu.Game.Graphics.Backgrounds; using osu.Game.Graphics.Backgrounds;
using osu.Game.Graphics.Sprites;
namespace osu.Game.Overlays.Pause namespace osu.Game.Overlays.Pause
{ {
@ -224,7 +225,7 @@ namespace osu.Game.Overlays.Pause
} }
} }
}, },
spriteText = new SpriteText spriteText = new OsuSpriteText
{ {
Text = Text, Text = Text,
Anchor = Anchor.Centre, Anchor = Anchor.Centre,

11
osu.Game/Overlays/Pause/PauseOverlay.cs
View File

@ -13,6 +13,7 @@ using osu.Framework.Graphics.Sprites;
using osu.Framework.Graphics.Containers; using osu.Framework.Graphics.Containers;
using osu.Framework.Graphics.Transformations; using osu.Framework.Graphics.Transformations;
using System.Threading.Tasks; using System.Threading.Tasks;
using osu.Game.Graphics.Sprites;
namespace osu.Game.Overlays.Pause namespace osu.Game.Overlays.Pause
{ {
@ -39,14 +40,14 @@ namespace osu.Game.Overlays.Pause
retryCounterContainer.Children = new Drawable[] retryCounterContainer.Children = new Drawable[]
{ {
new SpriteText new OsuSpriteText
{ {
Text = "You've retried ", Text = "You've retried ",
Shadow = true, Shadow = true,
ShadowColour = new Color4(0, 0, 0, 0.25f), ShadowColour = new Color4(0, 0, 0, 0.25f),
TextSize = 18 TextSize = 18
}, },
new SpriteText new OsuSpriteText
{ {
Text = String.Format("{0:n0}", value), Text = String.Format("{0:n0}", value),
Font = @"Exo2.0-Bold", Font = @"Exo2.0-Bold",
@ -54,7 +55,7 @@ namespace osu.Game.Overlays.Pause
ShadowColour = new Color4(0, 0, 0, 0.25f), ShadowColour = new Color4(0, 0, 0, 0.25f),
TextSize = 18 TextSize = 18
}, },
new SpriteText new OsuSpriteText
{ {
Text = $" time{((value == 1) ? "" : "s")} in this session", Text = $" time{((value == 1) ? "" : "s")} in this session",
Shadow = true, Shadow = true,
@ -119,7 +120,7 @@ namespace osu.Game.Overlays.Pause
Anchor = Anchor.TopCentre, Anchor = Anchor.TopCentre,
Children = new Drawable[] Children = new Drawable[]
{ {
new SpriteText new OsuSpriteText
{ {
Text = @"paused", Text = @"paused",
Font = @"Exo2.0-Medium", Font = @"Exo2.0-Medium",
@ -131,7 +132,7 @@ namespace osu.Game.Overlays.Pause
Shadow = true, Shadow = true,
ShadowColour = new Color4(0, 0, 0, 0.25f) 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?", Text = @"you're not going to do what i think you're going to do, are ya?",
Origin = Anchor.TopCentre, Origin = Anchor.TopCentre,

5
osu.Game/Screens/Select/FilterControl.cs
View File

@ -12,6 +12,7 @@ using osu.Framework.Graphics.Sprites;
using osu.Framework.Graphics.UserInterface; using osu.Framework.Graphics.UserInterface;
using osu.Framework.Input; using osu.Framework.Input;
using osu.Game.Graphics; using osu.Game.Graphics;
using osu.Game.Graphics.Sprites;
namespace osu.Game.Screens.Select namespace osu.Game.Screens.Select
{ {
@ -127,7 +128,7 @@ namespace osu.Game.Screens.Select
AutoSizeAxes = Axes.Both; AutoSizeAxes = Axes.Both;
Children = new Drawable[] Children = new Drawable[]
{ {
text = new SpriteText text = new OsuSpriteText
{ {
Margin = new MarginPadding(5), Margin = new MarginPadding(5),
TextSize = 14, TextSize = 14,
@ -213,7 +214,7 @@ namespace osu.Game.Screens.Select
Anchor = Anchor.TopRight, Anchor = Anchor.TopRight,
Children = new Drawable[] Children = new Drawable[]
{ {
sortLabel = new SpriteText sortLabel = new OsuSpriteText
{ {
Font = @"Exo2.0-Bold", Font = @"Exo2.0-Bold",
Text = "Sort results by", Text = "Sort results by",