diff --git a/osu.Game/Graphics/OsuFont.cs b/osu.Game/Graphics/OsuFont.cs
index 080d952cbd..44303b8527 100644
--- a/osu.Game/Graphics/OsuFont.cs
+++ b/osu.Game/Graphics/OsuFont.cs
@@ -35,7 +35,10 @@ namespace osu.Game.Graphics
/// Whether all characters should be spaced the same distance apart.
/// The .
public static FontUsage GetFont(Typeface typeface = Typeface.Torus, float size = DEFAULT_FONT_SIZE, FontWeight weight = FontWeight.Medium, bool italics = false, bool fixedWidth = false)
- => new FontUsage(GetFamilyString(typeface), size, GetWeightString(typeface, weight), getItalics(italics), fixedWidth);
+ {
+ string familyString = GetFamilyString(typeface);
+ return new FontUsage(familyString, size, GetWeightString(familyString, weight), getItalics(italics), fixedWidth);
+ }
private static bool getItalics(in bool italicsRequested)
{
@@ -72,25 +75,17 @@ namespace osu.Game.Graphics
///
/// Retrieves the string representation of a .
///
- /// The .
- /// The .
- /// The string representation of in the specified .
- public static string GetWeightString(Typeface typeface, FontWeight weight)
+ /// The font family.
+ /// The font weight.
+ /// The string representation of in the specified .
+ public static string GetWeightString(string family, FontWeight weight)
{
- if (typeface == Typeface.Torus && weight == FontWeight.Medium)
+ if (family == @"Torus" && weight == FontWeight.Medium)
// torus doesn't have a medium; fallback to regular.
weight = FontWeight.Regular;
- return GetWeightString(GetFamilyString(typeface), weight);
+ return weight.ToString();
}
-
- ///
- /// Retrieves the string representation of a .
- ///
- /// The family string.
- /// The .
- /// The string representation of in the specified .
- public static string GetWeightString(string family, FontWeight weight) => weight.ToString();
}
public static class OsuFontExtensions