feature: add support for song title and artist font size automatic adjustment

2026-01-13 03:34:55 +08:00 · 2025-10-24 14:08:28 -04:00
parent 8ab3a53a38
commit 2cb04fa1b7
11 changed files with 60 additions and 44 deletions
--- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Controls/AlbumArtLayoutSettingsControl.xaml
+++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Controls/AlbumArtLayoutSettingsControl.xaml
@@ -23,7 +23,7 @@
                                                 Glyph=&#xE744;}"
                        IsExpanded="True">
                        <controls:SettingsExpander.Items>
-                            <controls:SettingsCard x:Uid="SettingsPageAutoSize">
+                            <controls:SettingsCard x:Uid="SettingsPageAutoAdjust">
                                <ToggleSwitch IsOn="{x:Bind AlbumArtLayoutSettings.AutoAlbumArtSize, Mode=TwoWay}" />
                            </controls:SettingsCard>
                            <controls:SettingsCard IsEnabled="{x:Bind AlbumArtLayoutSettings.AutoAlbumArtSize, Converter={StaticResource BoolNegationConverter}, Mode=OneWay}">
@@ -67,14 +67,26 @@
                        </ComboBox>
                    </controls:SettingsCard>

-                    <controls:SettingsCard x:Uid="SettingsPageLyricsFontSize" HeaderIcon="{ui:FontIcon FontFamily={StaticResource IconFontFamily}, Glyph=&#xE8E9;}">
-                        <local:ExtendedSlider
-                            Default="18"
-                            Frequency="2"
-                            Maximum="72"
-                            Minimum="8"
-                            Value="{x:Bind AlbumArtLayoutSettings.SongInfoFontSize, Mode=TwoWay}" />
-                    </controls:SettingsCard>
+                    <controls:SettingsExpander
+                        x:Uid="SettingsPageLyricsFontSize"
+                        HeaderIcon="{ui:FontIcon FontFamily={StaticResource IconFontFamily},
+                                                 Glyph=&#xE8E9;}"
+                        IsExpanded="True">
+                        <controls:SettingsExpander.Items>
+                            <controls:SettingsCard x:Uid="SettingsPageAutoAdjust">
+                                <ToggleSwitch IsOn="{x:Bind AlbumArtLayoutSettings.IsAutoSongInfoFontSize, Mode=TwoWay}" />
+                            </controls:SettingsCard>
+                            <controls:SettingsCard>
+                                <local:ExtendedSlider
+                                    Default="18"
+                                    Frequency="2"
+                                    IsEnabled="{x:Bind AlbumArtLayoutSettings.IsAutoSongInfoFontSize, Mode=OneWay, Converter={StaticResource BoolNegationConverter}}"
+                                    Maximum="72"
+                                    Minimum="8"
+                                    Value="{x:Bind AlbumArtLayoutSettings.SongInfoFontSize, Mode=TwoWay}" />
+                            </controls:SettingsCard>
+                        </controls:SettingsExpander.Items>
+                    </controls:SettingsExpander>

                    <controls:SettingsExpander
                        x:Uid="SettingsPageShowTitle"
--- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Controls/LyricsSettingsControl.xaml
+++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Controls/LyricsSettingsControl.xaml
@@ -181,7 +181,7 @@
                                                 Glyph=&#xE8E9;}"
                        IsExpanded="True">
                        <controls:SettingsExpander.Items>
-                            <controls:SettingsCard x:Uid="SettingsPageDynamicLyricsFontSize">
+                            <controls:SettingsCard x:Uid="SettingsPageAutoAdjust">
                                <ToggleSwitch IsOn="{x:Bind LyricsStyleSettings.IsDynamicLyricsFontSize, Mode=TwoWay}" />
                            </controls:SettingsCard>
                            <controls:SettingsCard IsEnabled="{x:Bind LyricsStyleSettings.IsDynamicLyricsFontSize, Converter={StaticResource BoolNegationConverter}, Mode=OneWay}">
--- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Controls/LyricsWindowSettingsControl.xaml
+++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Controls/LyricsWindowSettingsControl.xaml
@@ -144,7 +144,10 @@
                                    IsExpanded="{x:Bind ViewModel.LiveStates.LyricsWindowStatus.IsAdaptToEnvironment, Mode=OneWay}">
                                    <ToggleSwitch IsOn="{x:Bind ViewModel.LiveStates.LyricsWindowStatus.IsAdaptToEnvironment, Mode=TwoWay}" />
                                    <controls:SettingsExpander.Items>
-                                        <controls:SettingsCard x:Uid="SettingsPageEnvColorSample" Header="Environment color sample mode">
+                                        <controls:SettingsCard
+                                            x:Uid="SettingsPageEnvColorSample"
+                                            Header="Environment color sample mode"
+                                            IsEnabled="{x:Bind ViewModel.LiveStates.LyricsWindowStatus.IsAdaptToEnvironment, Mode=OneWay}">
                                            <ComboBox SelectedIndex="{x:Bind ViewModel.LiveStates.LyricsWindowStatus.EnvironmentSampleMode, Mode=TwoWay, Converter={StaticResource EnumToIntConverter}}">
                                                <ComboBoxItem x:Uid="SettingsPageEnvColorSampleBelow" />
                                                <ComboBoxItem x:Uid="SettingsPageEnvColorSampleAbove" />
--- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/Settings/AlbumArtLayoutSettings.cs
+++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/Settings/AlbumArtLayoutSettings.cs
@@ -13,6 +13,7 @@ namespace BetterLyrics.WinUI3.Models.Settings
        [ObservableProperty][NotifyPropertyChangedRecipients] public partial TextAlignmentType SongInfoAlignmentType { get; set; } = TextAlignmentType.Left;
        [ObservableProperty][NotifyPropertyChangedRecipients] public partial int CoverImageRadius { get; set; } = 12; // 12 % of the cover image size
        [ObservableProperty][NotifyPropertyChangedRecipients] public partial int CoverImageShadowAmount { get; set; } = 12;
+        [ObservableProperty][NotifyPropertyChangedRecipients] public partial bool IsAutoSongInfoFontSize { get; set; } = true;
        [ObservableProperty][NotifyPropertyChangedRecipients] public partial int SongInfoFontSize { get; set; } = 18;
        [ObservableProperty][NotifyPropertyChangedRecipients] public partial bool ShowTitle { get; set; } = true;
        [ObservableProperty][NotifyPropertyChangedRecipients] public partial bool ShowArtists { get; set; } = true;
@@ -28,6 +29,7 @@ namespace BetterLyrics.WinUI3.Models.Settings
                SongInfoAlignmentType = this.SongInfoAlignmentType,
                CoverImageRadius = this.CoverImageRadius,
                CoverImageShadowAmount = this.CoverImageShadowAmount,
+                IsAutoSongInfoFontSize = this.IsAutoSongInfoFontSize,
                SongInfoFontSize = this.SongInfoFontSize,
                ShowTitle = this.ShowTitle,
                ShowArtists = this.ShowArtists,
--- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Strings/en-US/Resources.resw
+++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Strings/en-US/Resources.resw
@@ -520,9 +520,6 @@ If you encounter any problems, please go to the Settings page, About tab, and vi
  <data name="SettingsPageApply.Content" xml:space="preserve">
    <value>Apply</value>
  </data>
-  <data name="SettingsPageAutoSize.Header" xml:space="preserve">
-    <value>Automatic resizing</value>
-  </data>
  <data name="SettingsPageAutoStart.Header" xml:space="preserve">
    <value>Automatic startup</value>
  </data>
@@ -625,7 +622,7 @@ If you encounter any problems, please go to the Settings page, About tab, and vi
  <data name="SettingsPageDragArea.Header" xml:space="preserve">
    <value>Draggable area</value>
  </data>
-  <data name="SettingsPageDynamicLyricsFontSize.Header" xml:space="preserve">
+  <data name="SettingsPageAutoAdjust.Header" xml:space="preserve">
    <value>Automatic adjustment</value>
  </data>
  <data name="SettingsPageEasingFuncType.Header" xml:space="preserve">
--- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Strings/ja-JP/Resources.resw
+++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Strings/ja-JP/Resources.resw
@@ -520,8 +520,8 @@
  <data name="SettingsPageApply.Content" xml:space="preserve">
    <value>適用する</value>
  </data>
-  <data name="SettingsPageAutoSize.Header" xml:space="preserve">
-    <value>自動サイズ変更</value>
+  <data name="SettingsPageAutoAdjust.Header" xml:space="preserve">
+    <value>自動調整</value>
  </data>
  <data name="SettingsPageAutoStart.Header" xml:space="preserve">
    <value>自動起動</value>
@@ -625,9 +625,6 @@
  <data name="SettingsPageDragArea.Header" xml:space="preserve">
    <value>ドラッグ可能</value>
  </data>
-  <data name="SettingsPageDynamicLyricsFontSize.Header" xml:space="preserve">
-    <value>自動調整</value>
-  </data>
  <data name="SettingsPageEasingFuncType.Header" xml:space="preserve">
    <value>アニメーションタイプを緩和します</value>
  </data>
--- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Strings/ko-KR/Resources.resw
+++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Strings/ko-KR/Resources.resw
@@ -488,7 +488,7 @@
    <value>앨범 표지 소스를 구성합니다</value>
  </data>
  <data name="SettingsPageAlbumArtSize.Header" xml:space="preserve">
-    <value>앨범아트</value>
+    <value>앨범 아트 크기</value>
  </data>
  <data name="SettingsPageAlbumLib.Content" xml:space="preserve">
    <value>앨범 아트 소스</value>
@@ -520,8 +520,8 @@
  <data name="SettingsPageApply.Content" xml:space="preserve">
    <value>적용하다</value>
  </data>
-  <data name="SettingsPageAutoSize.Header" xml:space="preserve">
-    <value>자동 크기 조정</value>
+  <data name="SettingsPageAutoAdjust.Header" xml:space="preserve">
+    <value>자동 조정</value>
  </data>
  <data name="SettingsPageAutoStart.Header" xml:space="preserve">
    <value>자동 시작</value>
@@ -625,9 +625,6 @@
  <data name="SettingsPageDragArea.Header" xml:space="preserve">
    <value>드래그 가능</value>
  </data>
-  <data name="SettingsPageDynamicLyricsFontSize.Header" xml:space="preserve">
-    <value>자동 조정</value>
-  </data>
  <data name="SettingsPageEasingFuncType.Header" xml:space="preserve">
    <value>애니메이션 유형 완화</value>
  </data>
--- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Strings/zh-CN/Resources.resw
+++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Strings/zh-CN/Resources.resw
@@ -488,7 +488,7 @@
    <value>配置专辑封面源</value>
  </data>
  <data name="SettingsPageAlbumArtSize.Header" xml:space="preserve">
-    <value>专辑封面</value>
+    <value>专辑封面尺寸</value>
  </data>
  <data name="SettingsPageAlbumLib.Content" xml:space="preserve">
    <value>专辑封面源</value>
@@ -520,8 +520,8 @@
  <data name="SettingsPageApply.Content" xml:space="preserve">
    <value>应用</value>
  </data>
-  <data name="SettingsPageAutoSize.Header" xml:space="preserve">
-    <value>自动调整尺寸</value>
+  <data name="SettingsPageAutoAdjust.Header" xml:space="preserve">
+    <value>自动调整</value>
  </data>
  <data name="SettingsPageAutoStart.Header" xml:space="preserve">
    <value>自动启动</value>
@@ -625,9 +625,6 @@
  <data name="SettingsPageDragArea.Header" xml:space="preserve">
    <value>可拖拽区域</value>
  </data>
-  <data name="SettingsPageDynamicLyricsFontSize.Header" xml:space="preserve">
-    <value>自动调整</value>
-  </data>
  <data name="SettingsPageEasingFuncType.Header" xml:space="preserve">
    <value>缓动动画类型</value>
  </data>
--- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Strings/zh-TW/Resources.resw
+++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Strings/zh-TW/Resources.resw
@@ -488,7 +488,7 @@
    <value>配置專輯封面源</value>
  </data>
  <data name="SettingsPageAlbumArtSize.Header" xml:space="preserve">
-    <value>專輯封面</value>
+    <value>相簿藝術尺寸</value>
  </data>
  <data name="SettingsPageAlbumLib.Content" xml:space="preserve">
    <value>專輯封面來源</value>
@@ -520,8 +520,8 @@
  <data name="SettingsPageApply.Content" xml:space="preserve">
    <value>應用</value>
  </data>
-  <data name="SettingsPageAutoSize.Header" xml:space="preserve">
-    <value>自動調整大小</value>
+  <data name="SettingsPageAutoAdjust.Header" xml:space="preserve">
+    <value>自動調整</value>
  </data>
  <data name="SettingsPageAutoStart.Header" xml:space="preserve">
    <value>自動啟動</value>
@@ -625,9 +625,6 @@
  <data name="SettingsPageDragArea.Header" xml:space="preserve">
    <value>拖動</value>
  </data>
-  <data name="SettingsPageDynamicLyricsFontSize.Header" xml:space="preserve">
-    <value>自動調整</value>
-  </data>
  <data name="SettingsPageEasingFuncType.Header" xml:space="preserve">
    <value>緩動動畫類型</value>
  </data>
--- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/ViewModels/LyricsRendererViewModel/LyricsRendererViewModel.Messages.cs
+++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/ViewModels/LyricsRendererViewModel/LyricsRendererViewModel.Messages.cs
@@ -85,6 +85,10 @@ namespace BetterLyrics.WinUI3.ViewModels.LyricsRendererViewModel
                {
                    _isAlbumArtSizeChanged = true;
                }
+                else if (message.PropertyName == nameof(AlbumArtLayoutSettings.IsAutoSongInfoFontSize))
+                {
+                    UpdateSongInfoFontSize();
+                }
            }
            else if (message.Sender is LyricsBackgroundSettings)
            {
--- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/ViewModels/LyricsRendererViewModel/LyricsRendererViewModel.Update.cs
+++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/ViewModels/LyricsRendererViewModel/LyricsRendererViewModel.Update.cs
@@ -160,6 +160,8 @@ namespace BetterLyrics.WinUI3.ViewModels.LyricsRendererViewModel

            if (_isCanvasWidthChanged || _isCanvasHeightChanged)
            {
+                UpdateSongInfoFontSize();
+
                _isCoverAcrylicEffectAmountChanged = true;

                _effect?.Properties["Width"] = (float)control.ConvertDipsToPixels((float)_canvasWidth, CanvasDpiRounding.Round);
@@ -409,16 +411,16 @@ namespace BetterLyrics.WinUI3.ViewModels.LyricsRendererViewModel

            _lyricsXTransition.Update(_elapsedTime);
            _lyricsYTransition.Update(_elapsedTime);
-            
+
            _albumArtXTransition.Update(_elapsedTime);
            _albumArtYTransition.Update(_elapsedTime);
-            
+
            _lyricsOpacityTransition.Update(_elapsedTime);
            _albumArtOpacityTransition.Update(_elapsedTime);
-            
+
            _immersiveBgOpacityTransition.Update(_elapsedTime);
            _immersiveBgColorTransition.Update(_elapsedTime);
-            
+
            _albumArtAccentColor1Transition.Update(_elapsedTime);
            _albumArtAccentColor2Transition.Update(_elapsedTime);
            _albumArtAccentColor3Transition.Update(_elapsedTime);
@@ -783,8 +785,16 @@ namespace BetterLyrics.WinUI3.ViewModels.LyricsRendererViewModel

        private void UpdateSongInfoFontSize()
        {
-            _titleTextFormat.FontSize = _liveStatesService.LiveStates.LyricsWindowStatus.AlbumArtLayoutSettings.SongInfoFontSize;
-            _artistTextFormat.FontSize = _liveStatesService.LiveStates.LyricsWindowStatus.AlbumArtLayoutSettings.SongInfoFontSize - 2;
+            if (_liveStatesService.LiveStates.LyricsWindowStatus.AlbumArtLayoutSettings.IsAutoSongInfoFontSize)
+            {
+                _titleTextFormat.FontSize = (int)Math.Clamp(Math.Min(_canvasHeight, _canvasWidth) / 20, 8, 72);
+            }
+            else
+            {
+                _titleTextFormat.FontSize = _liveStatesService.LiveStates.LyricsWindowStatus.AlbumArtLayoutSettings.SongInfoFontSize;
+            }
+
+            _artistTextFormat.FontSize = (int)(_titleTextFormat.FontSize * 0.8);

            _isSongInfoFontSizeChanged = true;
        }