RepoMirrors
/
osu
mirror of https://github.com/ppy/osu
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Update obsoleted font usages

This commit is contained in:
Dean Herbert 2019-05-15 13:10:58 +09:00
parent e7409a28a3
commit 530032cafe
4 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
osu.Game.Tournament/Components/DrawableTournamentTeam.cs
View File

@ -6,6 +6,7 @@
using osu.Framework.Graphics.Containers; using osu.Framework.Graphics.Containers;
using osu.Framework.Graphics.Sprites; using osu.Framework.Graphics.Sprites;
using osu.Framework.Graphics.Textures; using osu.Framework.Graphics.Textures;
using osu.Game.Graphics;
using osu.Game.Graphics.Sprites; using osu.Game.Graphics.Sprites;
namespace osu.Game.Tournament.Components namespace osu.Game.Tournament.Components
@ -30,7 +31,7 @@ protected DrawableTournamentTeam(TournamentTeam team)
AcronymText = new OsuSpriteText AcronymText = new OsuSpriteText
{ {
Text = team?.Acronym?.ToUpperInvariant() ?? string.Empty, Text = team?.Acronym?.ToUpperInvariant() ?? string.Empty,
Font = @"Exo2.0-Regular" Font = OsuFont.GetFont(weight: FontWeight.Regular),
}; };
} }

2
osu.Game.Tournament/Components/TournamentBeatmapPanel.cs
View File

@ -86,7 +86,7 @@ private void load(LadderInfo ladder, Storage storage)
Text = new LocalisedString(( Text = new LocalisedString((
$"{Beatmap.Metadata.ArtistUnicode} - {Beatmap.Metadata.TitleUnicode}", $"{Beatmap.Metadata.ArtistUnicode} - {Beatmap.Metadata.TitleUnicode}",
$"{Beatmap.Metadata.Artist} - {Beatmap.Metadata.Title}")), $"{Beatmap.Metadata.Artist} - {Beatmap.Metadata.Title}")),
Font = @"Exo2.0-BoldItalic", Font = OsuFont.GetFont(weight: FontWeight.Bold, italics: true),
}, },
new FillFlowContainer new FillFlowContainer
{ {

2
osu.Game.Tournament/Screens/Ladder/Components/DrawableMatchTeam.cs
View File

@ -183,7 +183,7 @@ private void updateWinStyle()
background.FadeColour(winner ? colourWinner : colourNormal, winner ? 500 : 0, Easing.OutQuint); background.FadeColour(winner ? colourWinner : colourNormal, winner ? 500 : 0, Easing.OutQuint);
scoreText.Font = AcronymText.Font = winner ? "Exo2.0-Bold" : "Exo2.0-Regular"; scoreText.Font = AcronymText.Font = OsuFont.GetFont(weight: winner ? FontWeight.Bold : FontWeight.Regular);
} }
public MenuItem[] ContextMenuItems public MenuItem[] ContextMenuItems

3
osu.Game.Tournament/Screens/Ladder/Components/DrawableTournamentGrouping.cs
View File

@ -3,6 +3,7 @@
using osu.Framework.Graphics; using osu.Framework.Graphics;
using osu.Framework.Graphics.Containers; using osu.Framework.Graphics.Containers;
using osu.Game.Graphics;
using osu.Game.Graphics.Sprites; using osu.Game.Graphics.Sprites;
using osuTK.Graphics; using osuTK.Graphics;
@ -29,7 +30,7 @@ public DrawableTournamentGrouping(TournamentGrouping grouping, bool losers = fal
new OsuSpriteText new OsuSpriteText
{ {
Text = ((losers ? "Losers " : "") + grouping.Name).ToUpper(), Text = ((losers ? "Losers " : "") + grouping.Name).ToUpper(),
Font = "Exo2.0-Bold", Font = OsuFont.GetFont(weight: FontWeight.Bold),
Colour = Color4.Black, Colour = Color4.Black,
Origin = Anchor.TopCentre, Origin = Anchor.TopCentre,
Anchor = Anchor.TopCentre Anchor = Anchor.TopCentre