Merge pull request #1945 from andy840119/remove-lyric-scale-config

Remove the font size adjustment in the config.
karaoke-dev · Apr 21, 2023 · 975e1d4 · 975e1d4
2 parents dfc9170 + 0170cfa
commit 975e1d4
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 10 deletions.
diff --git a/osu.Game.Rulesets.Karaoke/Configuration/KaraokeRulesetConfigManager.cs b/osu.Game.Rulesets.Karaoke/Configuration/KaraokeRulesetConfigManager.cs
@@ -59,7 +59,6 @@ protected override void InitialiseDefaults()
             SetDefault(KaraokeRulesetSetting.MicrophoneDevice, string.Empty);
 
             // Font
-            SetDefault(KaraokeRulesetSetting.LyricScale, 2, 1, 4, 0.01);
             SetDefault(KaraokeRulesetSetting.MainFont, new FontUsage("Torus", 48, "Bold"), 48f, 48f);
             SetDefault(KaraokeRulesetSetting.RubyFont, new FontUsage("Torus", 20, "Bold"), 8f, 48f);
             SetDefault(KaraokeRulesetSetting.RubyMargin, 5, 0, 20);
@@ -161,7 +160,6 @@ public enum KaraokeRulesetSetting
         MicrophoneDevice,
 
         // Font
-        LyricScale,
         MainFont,
         RubyFont,
         RubyMargin,

diff --git a/osu.Game.Rulesets.Karaoke/Objects/Drawables/DrawableLyric.cs b/osu.Game.Rulesets.Karaoke/Objects/Drawables/DrawableLyric.cs
@@ -67,7 +67,7 @@ public DrawableLyric([CanBeNull] Lyric hitObject)
         [BackgroundDependencyLoader(true)]
         private void load([CanBeNull] KaraokeSessionStatics session)
         {
-            Scale = new Vector2((float)(config?.Get<double>(KaraokeRulesetSetting.LyricScale) ?? 2));
+            Scale = new Vector2(2);
             AutoSizeAxes = Axes.Both;
 
             AddInternal(lyricPieces = new Container<DefaultLyricPiece>

diff --git a/osu.Game.Rulesets.Karaoke/Screens/Settings/Sections/Graphics/LyricFontSettings.cs b/osu.Game.Rulesets.Karaoke/Screens/Settings/Sections/Graphics/LyricFontSettings.cs
@@ -25,13 +25,6 @@ private void load()
         {
             Children = new Drawable[]
             {
-                new SettingsSlider<double>
-                {
-                    LabelText = "Overall scale",
-                    Current = Config.GetBindable<double>(KaraokeRulesetSetting.LyricScale),
-                    KeyboardStep = 0.01f,
-                    DisplayAsPercentage = true
-                },
                 new SettingsFont
                 {
                     LabelText = "Default main font",