From e5d33177d42ad7acc4a021c5df7cee95e60248ca Mon Sep 17 00:00:00 2001 From: Zhe Fang Date: Sun, 26 Oct 2025 22:11:44 -0400 Subject: [PATCH] feat: phonetic, original and translated text can be displayed at the same time; support set cjk and western font family individually; phonetic and translated font size can be adjusted --- .../BetterLyrics.WinUI3.csproj | 15 +- .../Controls/FontFamilyAutoSuggestBox.xaml | 30 ++ .../Controls/FontFamilyAutoSuggestBox.xaml.cs | 95 +++++++ ....xaml => LyricsEffectSettingsControl.xaml} | 259 +++--------------- ...cs => LyricsEffectSettingsControl.xaml.cs} | 18 +- .../Controls/LyricsStyleSettingsControl.xaml | 241 ++++++++++++++++ .../LyricsStyleSettingsControl.xaml.cs | 40 +++ .../Controls/LyricsWindowSettingsControl.xaml | 25 +- .../Controls/PlaybackSettingsControl.xaml | 7 +- .../Helper/CanvasHelper.cs | 99 +++++-- .../Helper/LyricsParser.cs | 4 +- .../BetterLyrics.WinUI3/Models/LyricsData.cs | 63 +++-- .../BetterLyrics.WinUI3/Models/LyricsLine.cs | 132 +++++++-- .../Models/LyricsWindowStatus.cs | 6 +- .../Models/Settings/LyricsEffectSettings.cs | 15 +- .../Models/Settings/LyricsStyleSettings.cs | 21 +- .../MediaSessionsService.LyricsUpdater.cs | 100 ++++--- .../Strings/en-US/Resources.resw | 34 ++- .../Strings/ja-JP/Resources.resw | 34 ++- .../Strings/ko-KR/Resources.resw | 34 ++- .../Strings/zh-CN/Resources.resw | 34 ++- .../Strings/zh-TW/Resources.resw | 34 ++- .../LyricsRendererViewModel.Draw.cs | 38 +-- .../LyricsRendererViewModel.Messages.cs | 21 +- .../LyricsRendererViewModel.Update.cs | 113 ++++++-- .../LyricsRendererViewModel.cs | 12 +- .../BetterLyrics.WinUI3/Views/LyricsPage.xaml | 7 +- 27 files changed, 1068 insertions(+), 463 deletions(-) create mode 100644 BetterLyrics.WinUI3/BetterLyrics.WinUI3/Controls/FontFamilyAutoSuggestBox.xaml create mode 100644 BetterLyrics.WinUI3/BetterLyrics.WinUI3/Controls/FontFamilyAutoSuggestBox.xaml.cs rename BetterLyrics.WinUI3/BetterLyrics.WinUI3/Controls/{LyricsSettingsControl.xaml => LyricsEffectSettingsControl.xaml} (53%) rename BetterLyrics.WinUI3/BetterLyrics.WinUI3/Controls/{LyricsSettingsControl.xaml.cs => LyricsEffectSettingsControl.xaml.cs} (59%) create mode 100644 BetterLyrics.WinUI3/BetterLyrics.WinUI3/Controls/LyricsStyleSettingsControl.xaml create mode 100644 BetterLyrics.WinUI3/BetterLyrics.WinUI3/Controls/LyricsStyleSettingsControl.xaml.cs diff --git a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/BetterLyrics.WinUI3.csproj b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/BetterLyrics.WinUI3.csproj index ffff3cf..433b203 100644 --- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/BetterLyrics.WinUI3.csproj +++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/BetterLyrics.WinUI3.csproj @@ -27,8 +27,9 @@ + - + @@ -200,6 +201,16 @@ Always + + + MSBuild:Compile + + + + + MSBuild:Compile + + MSBuild:Compile @@ -241,7 +252,7 @@ - + MSBuild:Compile diff --git a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Controls/FontFamilyAutoSuggestBox.xaml b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Controls/FontFamilyAutoSuggestBox.xaml new file mode 100644 index 0000000..cdd338a --- /dev/null +++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Controls/FontFamilyAutoSuggestBox.xaml @@ -0,0 +1,30 @@ + + + + + + +