From 8191f03503b5ee06bcb1e64345c643a52de9db3a Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Thu, 27 Sep 2018 17:27:24 +0900
Subject: [PATCH] Implement HitCircleFont skin configuration

---
 osu.Game/Skinning/LegacySkin.cs        |  3 +--
 osu.Game/Skinning/LegacySkinDecoder.cs | 15 +++++++++++++++
 osu.Game/Skinning/SkinConfiguration.cs |  2 ++
 3 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Skinning/LegacySkin.cs b/osu.Game/Skinning/LegacySkin.cs
index 160cc412b4..bb37531c3e 100644
--- a/osu.Game/Skinning/LegacySkin.cs
+++ b/osu.Game/Skinning/LegacySkin.cs
@@ -57,8 +57,7 @@ public override Drawable GetDrawableComponent(string componentName)
                     componentName = "hit300";
                     break;
                 case "Play/osu/number-text":
-                    // Todo: Not necessarily default font
-                    return hasFont("default") ? new LegacySpriteText(Textures, "default") : null;
+                    return hasFont(Configuration.HitCircleFont) ? new LegacySpriteText(Textures, Configuration.HitCircleFont) : null;
             }
 
             var texture = GetTexture(componentName);
diff --git a/osu.Game/Skinning/LegacySkinDecoder.cs b/osu.Game/Skinning/LegacySkinDecoder.cs
index d4f1c5c6f1..67a031fb50 100644
--- a/osu.Game/Skinning/LegacySkinDecoder.cs
+++ b/osu.Game/Skinning/LegacySkinDecoder.cs
@@ -19,6 +19,7 @@ protected override void ParseLine(SkinConfiguration skin, Section section, strin
             switch (section)
             {
                 case Section.General:
+                {
                     var pair = SplitKeyVal(line);
 
                     switch (pair.Key)
@@ -32,6 +33,20 @@ protected override void ParseLine(SkinConfiguration skin, Section section, strin
                     }
 
                     break;
+                }
+                case Section.Fonts:
+                {
+                    var pair = SplitKeyVal(line);
+
+                    switch (pair.Key)
+                    {
+                        case "HitCirclePrefix":
+                            skin.HitCircleFont = pair.Value;
+                            break;
+                    }
+
+                    break;
+                }
             }
 
             base.ParseLine(skin, section, line);
diff --git a/osu.Game/Skinning/SkinConfiguration.cs b/osu.Game/Skinning/SkinConfiguration.cs
index ac59fcc7db..40f5c158cc 100644
--- a/osu.Game/Skinning/SkinConfiguration.cs
+++ b/osu.Game/Skinning/SkinConfiguration.cs
@@ -14,5 +14,7 @@ public class SkinConfiguration : IHasComboColours, IHasCustomColours
         public List<Color4> ComboColours { get; set; } = new List<Color4>();
 
         public Dictionary<string, Color4> CustomColours { get; set; } = new Dictionary<string, Color4>();
+
+        public string HitCircleFont { get; set; } = "default";
     }
 }