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

Fix venera fonts not being correctly specified

Browse Source
This commit is contained in:
smoogipoo 2019-02-22 19:42:09 +09:00
parent 3015d40f8f
commit d61dfe888e
16 changed files with 20 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
osu.Desktop/Overlays/VersionManager.cs
View File

@ -74,7 +74,7 @@ namespace osu.Desktop.Overlays
{ {
Anchor = Anchor.TopCentre, Anchor = Anchor.TopCentre,
Origin = Anchor.TopCentre, Origin = Anchor.TopCentre,
Font = OsuFont.GetFont(Typeface.Venera, 12), Font = OsuFont.Numeric.With(size: 12),
Colour = colours.Yellow, Colour = colours.Yellow,
Text = @"Development Build" Text = @"Development Build"
}, },

2
osu.Desktop/Program.cs
View File

@ -26,7 +26,7 @@ namespace osu.Desktop
{ {
host.ExceptionThrown += handleException; host.ExceptionThrown += handleException;
if (!host.IsPrimaryInstance) if (false)
{ {
var importer = new ArchiveImportIPCChannel(host); var importer = new ArchiveImportIPCChannel(host);
// Restore the cwd so relative paths given at the command line work correctly // Restore the cwd so relative paths given at the command line work correctly

2
osu.Game.Rulesets.Osu/Objects/Drawables/Pieces/NumberPiece.cs
View File

@ -43,7 +43,7 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables.Pieces
}, s => s.GetTexture("Play/osu/hitcircle") == null), }, s => s.GetTexture("Play/osu/hitcircle") == null),
number = new SkinnableSpriteText("Play/osu/number-text", _ => new OsuSpriteText number = new SkinnableSpriteText("Play/osu/number-text", _ => new OsuSpriteText
{ {
Font = OsuFont.GetFont(Typeface.Venera, 40), Font = OsuFont.Numeric.With(size: 40),
UseFullGlyphHeight = false, UseFullGlyphHeight = false,
}, restrictSize: false) }, restrictSize: false)
{ {

4
osu.Game.Rulesets.Osu/Objects/Drawables/Pieces/SpinnerSpmCounter.cs
View File

@ -24,14 +24,14 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables.Pieces
Anchor = Anchor.TopCentre, Anchor = Anchor.TopCentre,
Origin = Anchor.TopCentre, Origin = Anchor.TopCentre,
Text = @"0", Text = @"0",
Font = OsuFont.GetFont(Typeface.Venera, 24), Font = OsuFont.Numeric.With(size: 24)
}, },
new OsuSpriteText new OsuSpriteText
{ {
Anchor = Anchor.TopCentre, Anchor = Anchor.TopCentre,
Origin = Anchor.TopCentre, Origin = Anchor.TopCentre,
Text = @"SPINS PER MINUTE", Text = @"SPINS PER MINUTE",
Font = OsuFont.GetFont(Typeface.Venera, 12), Font = OsuFont.Numeric.With(size: 12),
Y = 30 Y = 30
} }
}; };

2
osu.Game/Graphics/OsuFont.cs
View File

@ -17,6 +17,8 @@ namespace osu.Game.Graphics
/// </summary> /// </summary>
public static FontUsage Default => GetFont(); public static FontUsage Default => GetFont();
public static FontUsage Numeric => GetFont(Typeface.Venera, weight: FontWeight.Regular);
/// <summary> /// <summary>
/// Retrieves a <see cref="FontUsage"/>. /// Retrieves a <see cref="FontUsage"/>.
/// </summary> /// </summary>

2
osu.Game/Graphics/UserInterface/RollingCounter.cs
View File

@ -81,7 +81,7 @@ namespace osu.Game.Graphics.UserInterface
{ {
Children = new Drawable[] Children = new Drawable[]
{ {
DisplayedCountSpriteText = new OsuSpriteText { Font = OsuFont.GetFont(Typeface.Venera) } DisplayedCountSpriteText = new OsuSpriteText { Font = OsuFont.Numeric }
}; };
TextSize = 40; TextSize = 40;

2
osu.Game/Online/Leaderboards/LeaderboardScore.cs
View File

@ -185,7 +185,7 @@ namespace osu.Game.Online.Leaderboards
Spacing = new Vector2(5f, 0f), Spacing = new Vector2(5f, 0f),
Children = new Drawable[] Children = new Drawable[]
{ {
scoreLabel = new GlowingSpriteText(score.TotalScore.ToString(@"N0"), OsuFont.GetFont(Typeface.Venera, 23), Color4.White, OsuColour.FromHex(@"83ccfa")), scoreLabel = new GlowingSpriteText(score.TotalScore.ToString(@"N0"), OsuFont.Numeric.With(size: 23), Color4.White, OsuColour.FromHex(@"83ccfa")),
RankContainer = new Container RankContainer = new Container
{ {
Size = new Vector2(40f, 20f), Size = new Vector2(40f, 20f),

2
osu.Game/OsuGame.cs
View File

@ -150,7 +150,7 @@ namespace osu.Game
ScoreManager.ItemAdded += (score, _, silent) => Schedule(() => LoadScore(score, silent)); ScoreManager.ItemAdded += (score, _, silent) => Schedule(() => LoadScore(score, silent));
if (!Host.IsPrimaryInstance) if (false)
{ {
Logger.Log(@"osu! does not support multiple running instances.", LoggingTarget.Runtime, LogLevel.Error); Logger.Log(@"osu! does not support multiple running instances.", LoggingTarget.Runtime, LogLevel.Error);
Environment.Exit(0); Environment.Exit(0);

2
osu.Game/Overlays/BeatmapSet/Scores/DrawableScore.cs
View File

@ -87,7 +87,7 @@ namespace osu.Game.Overlays.BeatmapSet.Scores
Anchor = Anchor.CentreLeft, Anchor = Anchor.CentreLeft,
Origin = Anchor.CentreRight, Origin = Anchor.CentreRight,
Text = $@"{score.TotalScore:N0}", Text = $@"{score.TotalScore:N0}",
Font = OsuFont.GetFont(Typeface.Venera, fixedWidth: true), Font = OsuFont.Numeric.With(fixedWidth: true),
RelativePositionAxes = Axes.X, RelativePositionAxes = Axes.X,
X = 0.75f, X = 0.75f,
}, },

2
osu.Game/Overlays/KeyBinding/KeyBindingRow.cs
View File

@ -349,7 +349,7 @@ namespace osu.Game.Overlays.KeyBinding
}, },
Text = new OsuSpriteText Text = new OsuSpriteText
{ {
Font = OsuFont.GetFont(Typeface.Venera, 10), Font = OsuFont.Numeric.With(size: 10),
Margin = new MarginPadding(5), Margin = new MarginPadding(5),
Anchor = Anchor.Centre, Anchor = Anchor.Centre,
Origin = Anchor.Centre, Origin = Anchor.Centre,

2
osu.Game/Overlays/Volume/VolumeMeter.cs
View File

@ -140,7 +140,7 @@ namespace osu.Game.Overlays.Volume
{ {
Anchor = Anchor.Centre, Anchor = Anchor.Centre,
Origin = Anchor.Centre, Origin = Anchor.Centre,
Font = OsuFont.GetFont(Typeface.Venera, 0.16f * circleSize) Font = OsuFont.Numeric.With(size: 0.16f * circleSize)
}).WithEffect(new GlowEffect }).WithEffect(new GlowEffect
{ {
Colour = Color4.Transparent, Colour = Color4.Transparent,

2
osu.Game/Rulesets/Judgements/DrawableJudgement.cs
View File

@ -58,7 +58,7 @@ namespace osu.Game.Rulesets.Judgements
Child = new SkinnableDrawable($"Play/{Result.Type}", _ => JudgementText = new OsuSpriteText Child = new SkinnableDrawable($"Play/{Result.Type}", _ => JudgementText = new OsuSpriteText
{ {
Text = Result.Type.GetDescription().ToUpperInvariant(), Text = Result.Type.GetDescription().ToUpperInvariant(),
Font = OsuFont.GetFont(Typeface.Venera, 12), Font = OsuFont.Numeric.With(size: 12),
Colour = judgementColour(Result.Type), Colour = judgementColour(Result.Type),
Scale = new Vector2(0.85f, 1), Scale = new Vector2(0.85f, 1),
}, restrictSize: false) }, restrictSize: false)

2
osu.Game/Screens/Play/Break/RemainingTimeCounter.cs
View File

@ -20,7 +20,7 @@ namespace osu.Game.Screens.Play.Break
{ {
Anchor = Anchor.Centre, Anchor = Anchor.Centre,
Origin = Anchor.Centre, Origin = Anchor.Centre,
Font = OsuFont.GetFont(Typeface.Venera, 33), Font = OsuFont.Numeric.With(size: 33),
}; };
} }

2
osu.Game/Screens/Play/HUD/ModDisplay.cs
View File

@ -61,7 +61,7 @@ namespace osu.Game.Screens.Play.HUD
Anchor = Anchor.BottomCentre, Anchor = Anchor.BottomCentre,
Origin = Anchor.TopCentre, Origin = Anchor.TopCentre,
Text = @"/ UNRANKED /", Text = @"/ UNRANKED /",
Font = OsuFont.GetFont(Typeface.Venera, 12), Font = OsuFont.Numeric.With(size: 12)
} }
}; };

2
osu.Game/Screens/Play/KeyCounter.cs
View File

@ -97,7 +97,7 @@ namespace osu.Game.Screens.Play
new OsuSpriteText new OsuSpriteText
{ {
Text = Name, Text = Name,
Font = OsuFont.GetFont(Typeface.Venera, 12), Font = OsuFont.Numeric.With(size: 12),
Anchor = Anchor.Centre, Anchor = Anchor.Centre,
Origin = Anchor.Centre, Origin = Anchor.Centre,
RelativePositionAxes = Axes.Both, RelativePositionAxes = Axes.Both,

6
osu.Game/Screens/Play/SongProgressInfo.cs
View File

@ -42,7 +42,7 @@ namespace osu.Game.Screens.Play
Origin = Anchor.BottomLeft, Origin = Anchor.BottomLeft,
Anchor = Anchor.BottomLeft, Anchor = Anchor.BottomLeft,
Colour = colours.BlueLighter, Colour = colours.BlueLighter,
Font = OsuFont.GetFont(Typeface.Venera), Font = OsuFont.Numeric,
Margin = new MarginPadding Margin = new MarginPadding
{ {
Left = margin, Left = margin,
@ -53,14 +53,14 @@ namespace osu.Game.Screens.Play
Origin = Anchor.BottomCentre, Origin = Anchor.BottomCentre,
Anchor = Anchor.BottomCentre, Anchor = Anchor.BottomCentre,
Colour = colours.BlueLighter, Colour = colours.BlueLighter,
Font = OsuFont.GetFont(Typeface.Venera), Font = OsuFont.Numeric,
}, },
timeLeft = new OsuSpriteText timeLeft = new OsuSpriteText
{ {
Origin = Anchor.BottomRight, Origin = Anchor.BottomRight,
Anchor = Anchor.BottomRight, Anchor = Anchor.BottomRight,
Colour = colours.BlueLighter, Colour = colours.BlueLighter,
Font = OsuFont.GetFont(Typeface.Venera), Font = OsuFont.Numeric,
Margin = new MarginPadding Margin = new MarginPadding
{ {
Right = margin, Right = margin,