h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2025-01-28 09:02:58 +08:00
Code Issues Releases Wiki Activity

Use OsuSpriteText.

Browse Source
This commit is contained in:
Dean Herbert 2017-03-03 20:27:53 +09:00
parent 1ea1118db6
commit 2ac248c7d0
No known key found for this signature in database
GPG Key ID: 46D71BF4958ABB49
3 changed files with 20 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
osu.Game/Overlays/Dialog/PopupDialog.cs
View File

@ -11,6 +11,7 @@ using osu.Framework.Graphics.Transforms;
using osu.Framework.Input; using osu.Framework.Input;
using osu.Game.Graphics; using osu.Game.Graphics;
using osu.Game.Graphics.Backgrounds; using osu.Game.Graphics.Backgrounds;
using osu.Game.Graphics.Sprites;
using OpenTK; using OpenTK;
using OpenTK.Graphics; using OpenTK.Graphics;
using OpenTK.Input; using OpenTK.Input;
@ -211,7 +212,7 @@ namespace osu.Game.Overlays.Dialog
}, },
}, },
}, },
header = new SpriteText header = new OsuSpriteText
{ {
Origin = Anchor.TopCentre, Origin = Anchor.TopCentre,
Anchor = Anchor.TopCentre, Anchor = Anchor.TopCentre,
@ -219,7 +220,7 @@ namespace osu.Game.Overlays.Dialog
TextSize = 25, TextSize = 25,
Shadow = true, Shadow = true,
}, },
body = new SpriteText body = new OsuSpriteText
{ {
Origin = Anchor.TopCentre, Origin = Anchor.TopCentre,
Anchor = Anchor.TopCentre, Anchor = Anchor.TopCentre,

7
osu.Game/Screens/Tournament/Drawings.cs
View File

@ -14,6 +14,7 @@ using osu.Framework.Graphics.Sprites;
using osu.Framework.Graphics.Textures; using osu.Framework.Graphics.Textures;
using osu.Framework.Logging; using osu.Framework.Logging;
using osu.Framework.Platform; using osu.Framework.Platform;
using osu.Game.Graphics.Sprites;
using osu.Game.Graphics.UserInterface; using osu.Game.Graphics.UserInterface;
using osu.Game.Screens.Backgrounds; using osu.Game.Screens.Backgrounds;
using osu.Game.Screens.Tournament.Components; using osu.Game.Screens.Tournament.Components;
@ -32,7 +33,7 @@ namespace osu.Game.Screens.Tournament
private ScrollingTeamContainer teamsContainer; private ScrollingTeamContainer teamsContainer;
private GroupsContainer groupsContainer; private GroupsContainer groupsContainer;
private SpriteText fullTeamNameText; private OsuSpriteText fullTeamNameText;
private List<Team> allTeams = new List<Team>(); private List<Team> allTeams = new List<Team>();
@ -124,7 +125,7 @@ namespace osu.Game.Screens.Tournament
RelativeSizeAxes = Axes.X, RelativeSizeAxes = Axes.X,
}, },
// Scrolling team name // Scrolling team name
fullTeamNameText = new SpriteText fullTeamNameText = new OsuSpriteText
{ {
Anchor = Anchor.Centre, Anchor = Anchor.Centre,
Origin = Anchor.TopCentre, Origin = Anchor.TopCentre,
@ -151,7 +152,7 @@ namespace osu.Game.Screens.Tournament
RelativeSizeAxes = Axes.Both, RelativeSizeAxes = Axes.Both,
Colour = new Color4(54, 54, 54, 255) Colour = new Color4(54, 54, 54, 255)
}, },
new SpriteText new OsuSpriteText
{ {
Anchor = Anchor.TopCentre, Anchor = Anchor.TopCentre,
Origin = Anchor.TopCentre, Origin = Anchor.TopCentre,

28
osu.Game/Screens/Tournament/Group.cs
View File

@ -1,20 +1,18 @@
// Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>. // Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE // Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
using OpenTK; using System.Collections.Generic;
using OpenTK.Graphics; using System.Linq;
using System.Text;
using osu.Framework.Allocation; using osu.Framework.Allocation;
using osu.Framework.Graphics; using osu.Framework.Graphics;
using osu.Framework.Graphics.Containers; using osu.Framework.Graphics.Containers;
using osu.Framework.Graphics.Primitives; using osu.Framework.Graphics.Primitives;
using osu.Framework.Graphics.Sprites; using osu.Framework.Graphics.Sprites;
using osu.Framework.Graphics.Textures; using osu.Framework.Graphics.Textures;
using osu.Framework.Timing; using osu.Game.Graphics.Sprites;
using System; using OpenTK;
using System.Collections.Generic; using OpenTK.Graphics;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace osu.Game.Screens.Tournament namespace osu.Game.Screens.Tournament
{ {
@ -39,13 +37,13 @@ namespace osu.Game.Screens.Tournament
Children = new Drawable[] Children = new Drawable[]
{ {
new Box() new Box
{ {
RelativeSizeAxes = Axes.Both, RelativeSizeAxes = Axes.Both,
Colour = new Color4(54, 54, 54, 255) Colour = new Color4(54, 54, 54, 255)
}, },
// Group name // Group name
new SpriteText() new OsuSpriteText
{ {
Anchor = Anchor.TopCentre, Anchor = Anchor.TopCentre,
Origin = Anchor.TopCentre, Origin = Anchor.TopCentre,
@ -57,13 +55,13 @@ namespace osu.Game.Screens.Tournament
Font = @"Exo2.0-Bold", Font = @"Exo2.0-Bold",
Colour = new Color4(255, 204, 34, 255), Colour = new Color4(255, 204, 34, 255),
}, },
teams = new FillFlowContainer<GroupTeam>() teams = new FillFlowContainer<GroupTeam>
{ {
RelativeSizeAxes = Axes.Both, RelativeSizeAxes = Axes.Both,
Spacing = new Vector2(6f, 22), Spacing = new Vector2(6f, 22),
Margin = new MarginPadding() Margin = new MarginPadding
{ {
Top = 21f, Top = 21f,
Bottom = 7f, Bottom = 7f,
@ -137,7 +135,7 @@ namespace osu.Game.Screens.Tournament
Children = new Drawable[] Children = new Drawable[]
{ {
innerContainer = new FillFlowContainer() innerContainer = new FillFlowContainer
{ {
Anchor = Anchor.Centre, Anchor = Anchor.Centre,
Origin = Anchor.Centre, Origin = Anchor.Centre,
@ -152,14 +150,14 @@ namespace osu.Game.Screens.Tournament
Children = new Drawable[] Children = new Drawable[]
{ {
flagSprite = new Sprite() flagSprite = new Sprite
{ {
Anchor = Anchor.TopCentre, Anchor = Anchor.TopCentre,
Origin = Anchor.TopCentre, Origin = Anchor.TopCentre,
FillMode = FillMode.Fit FillMode = FillMode.Fit
}, },
new SpriteText() new OsuSpriteText
{ {
Anchor = Anchor.TopCentre, Anchor = Anchor.TopCentre,
Origin = Anchor.TopCentre, Origin = Anchor.TopCentre,