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

Get rid of dublicated enum

Browse Source
This commit is contained in:
ansel 2022-12-03 23:32:17 +03:00
parent b41f30c868
commit 8174f6be64
2 changed files with 2 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
osu.Game/Skinning/Components/DefaultTextSkinComponent.cs
View File

@ -17,7 +17,7 @@ namespace osu.Game.Skinning.Components
public bool UsesFixedAnchor { get; set; } public bool UsesFixedAnchor { get; set; }
[SettingSource("Font", "Font to use.")] [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); protected abstract void SetFont(FontUsage font);
@ -26,15 +26,7 @@ namespace osu.Game.Skinning.Components
base.LoadComplete(); base.LoadComplete();
Font.BindValueChanged(e => Font.BindValueChanged(e =>
{ {
FontUsage f = e.NewValue switch FontUsage f = OsuFont.GetFont(e.NewValue);
{
DefaultFont.Venera => OsuFont.Numeric,
DefaultFont.Torus => OsuFont.Torus,
DefaultFont.TorusAlt => OsuFont.TorusAlternate,
DefaultFont.Inter => OsuFont.Inter,
_ => OsuFont.Default
};
SetFont(f); SetFont(f);
}, true); }, true);
} }

18
osu.Game/Skinning/DefaultFont.cs
View File

@ -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
}
}