From 8174f6be64a7877c0e0788028303236ef01e1ec6 Mon Sep 17 00:00:00 2001
From: ansel <79257300125@ya.ru>
Date: Sat, 3 Dec 2022 23:32:17 +0300
Subject: [PATCH] Get rid of dublicated enum

---
 .../Components/DefaultTextSkinComponent.cs     | 12 ++----------
 osu.Game/Skinning/DefaultFont.cs               | 18 ------------------
 2 files changed, 2 insertions(+), 28 deletions(-)
 delete mode 100644 osu.Game/Skinning/DefaultFont.cs

diff --git a/osu.Game/Skinning/Components/DefaultTextSkinComponent.cs b/osu.Game/Skinning/Components/DefaultTextSkinComponent.cs
index aff400c798..1fd29effbd 100644
--- a/osu.Game/Skinning/Components/DefaultTextSkinComponent.cs
+++ b/osu.Game/Skinning/Components/DefaultTextSkinComponent.cs
@@ -17,7 +17,7 @@ namespace osu.Game.Skinning.Components
         public bool UsesFixedAnchor { get; set; }
 
         [SettingSource("Font", "Font to use.")]
-        public Bindable<DefaultFont> Font { get; } = new Bindable<DefaultFont>(DefaultFont.Torus);
+        public Bindable<Typeface> Font { get; } = new Bindable<Typeface>(Typeface.Torus);
 
         protected abstract void SetFont(FontUsage font);
 
@@ -26,15 +26,7 @@ namespace osu.Game.Skinning.Components
             base.LoadComplete();
             Font.BindValueChanged(e =>
             {
-                FontUsage f = e.NewValue switch
-                {
-                    DefaultFont.Venera => OsuFont.Numeric,
-                    DefaultFont.Torus => OsuFont.Torus,
-                    DefaultFont.TorusAlt => OsuFont.TorusAlternate,
-                    DefaultFont.Inter => OsuFont.Inter,
-                    _ => OsuFont.Default
-                };
-
+                FontUsage f = OsuFont.GetFont(e.NewValue);
                 SetFont(f);
             }, true);
         }
diff --git a/osu.Game/Skinning/DefaultFont.cs b/osu.Game/Skinning/DefaultFont.cs
deleted file mode 100644
index 69b6aaaff4..0000000000
--- a/osu.Game/Skinning/DefaultFont.cs
+++ /dev/null
@@ -1,18 +0,0 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
-// See the LICENCE file in the repository root for full licence text.
-
-using osu.Game.Skinning.Components;
-
-namespace osu.Game.Skinning
-{
-    /// <summary>
-    /// The type of built-in font to use for <see cref="DefaultTextSkinComponent"/>.
-    /// </summary>
-    public enum DefaultFont
-    {
-        Venera,
-        Torus,
-        TorusAlt,
-        Inter
-    }
-}