feat: add credit list in settings

BetterLyrics.WinUI3/BetterLyrics.WinUI3 (Package)/Package.appxmanifest

@@ -12,7 +12,7 @@
 	<Identity
 	  Name="37412.BetterLyrics"
 	  Publisher="CN=E1428B0E-DC1D-4EA4-ACB1-4556569D5BA9"
-	  Version="1.1.165.0" />
+	  Version="1.1.175.0" />
 
 	<mp:PhoneIdentity PhoneProductId="ca4a4830-fc19-40d9-b823-53e2bff3d816" PhonePublisherId="00000000-0000-0000-0000-000000000000"/>
 

BetterLyrics.WinUI3/BetterLyrics.WinUI3/App.xaml

@@ -50,6 +50,7 @@
             <converter:CornerRadiusToDoubleConverter x:Key="CornerRadiusToDoubleConverter" />
             <converter:LyricsSearchProviderToDisplayNameConverter x:Key="LyricsSearchProviderToDisplayNameConverter" />
             <converter:TranslationSearchProviderToDisplayNameConverter x:Key="TranslationSearchProviderToDisplayNameConverter" />
+            <converter:TransliterationSearchProviderToDisplayNameConverter x:Key="TransliterationSearchProviderToDisplayNameConverter" />
             <converter:AlbumArtSearchProviderToDisplayNameConverter x:Key="AlbumArtSearchProviderToDisplayNameConverter" />
             <converter:SecondsToFormattedTimeConverter x:Key="SecondsToFormattedTimeConverter" />
             <converter:MillisecondsToFormattedTimeConverter x:Key="MillisecondsToFormattedTimeConverter" />
@@ -95,8 +96,7 @@
                 <Setter Property="VerticalAlignment" Value="Top" />
                 <Setter Property="CornerRadius" Value="4" />
                 <Setter Property="BorderThickness" Value="0" />
-                <Setter Property="Padding" Value="16,9,16,11" />
-                <Setter Property="Margin" Value="0" />
+                <Setter Property="Padding" Value="14,6,14,9" />
                 <Setter Property="Background" Value="Transparent" />
             </Style>
             <Style x:Key="GhostButtonStyle" TargetType="Button">
@@ -110,10 +110,10 @@
                 x:Key="TitleBarToggleButtonStyle"
                 BasedOn="{StaticResource ToggleButtonRevealStyle}"
                 TargetType="ToggleButton">
+                <Setter Property="VerticalAlignment" Value="Top" />
                 <Setter Property="CornerRadius" Value="4" />
-                <Setter Property="VerticalAlignment" Value="Stretch" />
                 <Setter Property="BorderThickness" Value="0" />
-                <Setter Property="Padding" Value="16,9,16,11" />
+                <Setter Property="Padding" Value="14,6,14,9" />
                 <Setter Property="Background" Value="Transparent" />
             </Style>
             <Style x:Key="GhostToggleButtonStyle" TargetType="ToggleButton">

BetterLyrics.WinUI3/BetterLyrics.WinUI3/App.xaml.cs

@@ -6,7 +6,6 @@ using BetterLyrics.WinUI3.Services.AlbumArtSearchService;
 using BetterLyrics.WinUI3.Services.DiscordService;
 using BetterLyrics.WinUI3.Services.LastFMService;
 using BetterLyrics.WinUI3.Services.LibWatcherService;
-using BetterLyrics.WinUI3.Services.LiveStatesService;
 using BetterLyrics.WinUI3.Services.LyricsSearchService;
 using BetterLyrics.WinUI3.Services.MediaSessionsService;
 using BetterLyrics.WinUI3.Services.ResourceService;
@@ -21,6 +20,7 @@ using Microsoft.UI.Xaml;
 using Microsoft.Windows.ApplicationModel.Resources;
 using Serilog;
 using System;
+using System.Linq;
 using System.Text;
 using System.Threading;
 using System.Threading.Tasks;
@@ -68,8 +68,26 @@ namespace BetterLyrics.WinUI3
 
         protected override void OnLaunched(LaunchActivatedEventArgs args)
         {
-            WindowHook.OpenOrShowWindow<NowPlayingWindow>();
-            if (Ioc.Default.GetRequiredService<ISettingsService>().AppSettings.MusicGallerySettings.AutoOpen)
+            var settingsService = Ioc.Default.GetRequiredService<ISettingsService>();
+
+            WindowHook.OpenOrShowWindow<SystemTrayWindow>();
+
+            if (settingsService.AppSettings.GeneralSettings.AutoStartLyricsWindow)
+            {
+                var defaultStatus = settingsService.AppSettings.WindowBoundsRecords.Where(x => x.IsDefault);
+                if (defaultStatus != null)
+                {
+                    foreach (var item in defaultStatus)
+                    {
+                        WindowHook.OpenOrShowWindow<NowPlayingWindow>(item);
+                        if (!settingsService.AppSettings.GeneralSettings.MultiNowPlayingWindowMode)
+                        {
+                            break;
+                        }
+                    }
+                }
+            }
+            if (settingsService.AppSettings.MusicGallerySettings.AutoOpen)
             {
                 WindowHook.OpenOrShowWindow<MusicGalleryWindow>();
             }
@@ -91,7 +109,6 @@ namespace BetterLyrics.WinUI3
                         loggingBuilder.AddSerilog();
                     })
                     // Services
-                    .AddSingleton<ILiveStatesService, LiveStatesService>()
                     .AddSingleton<ISettingsService, SettingsService>()
                     .AddSingleton<IMediaSessionsService, MediaSessionsService>()
                     .AddSingleton<IAlbumArtSearchService, AlbumArtSearchService>()
@@ -109,13 +126,17 @@ namespace BetterLyrics.WinUI3
                     .AddSingleton<LyricsWindowSettingsControlViewModel>()
                     .AddSingleton<LyricsWindowSwitchControlViewModel>()
                     .AddSingleton<LyricsWindowSwitchWindowViewModel>()
-                    .AddSingleton<NowPlayingWindowViewModel>()
                     .AddSingleton<SettingsWindowViewModel>()
                     .AddSingleton<SystemTrayViewModel>()
                     .AddSingleton<SettingsPageViewModel>()
-                    .AddSingleton<NowPlayingPageViewModel>()
-                    .AddSingleton<MusicGalleryViewModel>()
+                    .AddSingleton<MusicGalleryPageViewModel>()
                     .AddSingleton<AboutControlViewModel>()
+                    .AddSingleton<MusicGalleryWindowViewModel>()
+
+                    .AddTransient<NowPlayingWindowViewModel>()
+                    .AddTransient<NowPlayingPageViewModel>()
+                    .AddTransient<NowPlayingBarViewModel>()
+
                     .BuildServiceProvider()
             );
         }

BetterLyrics.WinUI3/BetterLyrics.WinUI3/BetterLyrics.WinUI3.csproj

@@ -23,25 +23,29 @@
 		<None Remove="Assets\Segoe Fluent Icons.ttf" />
 		<None Remove="Assets\Wiki82.profile.xml" />
 		<None Remove="Controls\AboutControl.xaml" />
-		<None Remove="Controls\AlbumArtLayoutSettingsControl.xaml" />
+		<None Remove="Controls\AlbumArtAreaEffectSettingsControl.xaml" />
 		<None Remove="Controls\AppSettingsControl.xaml" />
 		<None Remove="Controls\DemoWindowGrid.xaml" />
 		<None Remove="Controls\ExtendedSlider.xaml" />
 		<None Remove="Controls\FontFamilyAutoSuggestBox.xaml" />
+		<None Remove="Controls\ImageSwitcher.xaml" />
 		<None Remove="Controls\LyricsSearchControl.xaml" />
 		<None Remove="Controls\LyricsStyleSettingsControl.xaml" />
 		<None Remove="Controls\LyricsWindowSettingsControl.xaml" />
 		<None Remove="Controls\LyricsWindowSwitchControl.xaml" />
 		<None Remove="Controls\MediaSettingsControl.xaml" />
+		<None Remove="Controls\NowPlayingBar.xaml" />
 		<None Remove="Controls\PlaybackSettingsControl.xaml" />
 		<None Remove="Controls\PropertyRow.xaml" />
 		<None Remove="Controls\ShortcutTextBox.xaml" />
 		<None Remove="Controls\SystemTray.xaml" />
+		<None Remove="Controls\WindowSettingsControl.xaml" />
 		<None Remove="Views\LyricsSearchWindow.xaml" />
 		<None Remove="Views\LyricsWindowSwitchWindow.xaml" />
 		<None Remove="Views\MusicGalleryPage.xaml" />
 		<None Remove="Views\MusicGalleryWindow.xaml" />
 		<None Remove="Views\SettingsWindow.xaml" />
+		<None Remove="Views\SystemTrayWindow.xaml" />
 	</ItemGroup>
 	<ItemGroup>
 		<Content Include="Logo.ico" />
@@ -65,10 +69,10 @@
 		<PackageReference Include="ComputeSharp.D2D1.WinUI" Version="3.2.0" />
 		<PackageReference Include="csharp-kana" Version="1.0.2" />
 		<PackageReference Include="csharp-pinyin" Version="1.0.1" />
-		<PackageReference Include="DevWinUI.Controls" Version="9.6.0" />
+		<PackageReference Include="DevWinUI.Controls" Version="9.7.0" />
 		<PackageReference Include="Dubya.WindowsMediaController" Version="2.5.5" />
-		<PackageReference Include="F23.StringSimilarity" Version="7.0.0" />
-		<PackageReference Include="H.NotifyIcon.WinUI" Version="2.3.2" />
+		<PackageReference Include="F23.StringSimilarity" Version="7.0.1" />
+		<PackageReference Include="H.NotifyIcon.WinUI" Version="2.4.1" />
 		<PackageReference Include="Hqub.Last.fm" Version="2.5.1" />
 		<PackageReference Include="Lyricify.Lyrics.Helper-NativeAot" Version="0.1.4-alpha.5" />
 		<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="10.0.0" />
@@ -292,7 +296,7 @@
 	  </Page>
 	</ItemGroup>
 	<ItemGroup>
-	  <Page Update="Controls\AlbumArtLayoutSettingsControl.xaml">
+	  <Page Update="Controls\AlbumArtAreaStyleSettingsControl.xaml">
 	    <Generator>MSBuild:Compile</Generator>
 	  </Page>
 	</ItemGroup>
@@ -334,6 +338,36 @@
 	<ItemGroup>
 	  <Folder Include="TemplateSelector\" />
 	</ItemGroup>
+	<ItemGroup>
+	  <Page Update="Controls\NowPlayingBar.xaml">
+	    <Generator>MSBuild:Compile</Generator>
+	  </Page>
+	</ItemGroup>
+	<ItemGroup>
+	  <Page Update="Views\SystemTrayWindow.xaml">
+	    <Generator>MSBuild:Compile</Generator>
+	  </Page>
+	</ItemGroup>
+	<ItemGroup>
+	  <Page Update="Controls\WindowSettingsControl.xaml">
+	    <Generator>MSBuild:Compile</Generator>
+	  </Page>
+	</ItemGroup>
+	<ItemGroup>
+	  <Page Update="Controls\AlbumArtAreaEffectSettingsControl.xaml">
+	    <Generator>MSBuild:Compile</Generator>
+	  </Page>
+	</ItemGroup>
+	<ItemGroup>
+	  <Page Update="Controls\ImageSwitcher.xaml">
+	    <Generator>MSBuild:Compile</Generator>
+	  </Page>
+	</ItemGroup>
+	<ItemGroup>
+	  <Page Update="Controls\ShadowImage.xaml">
+	    <Generator>MSBuild:Compile</Generator>
+	  </Page>
+	</ItemGroup>
 	<ItemGroup>
 	  <Page Update="Controls\PropertyRow.xaml">
 	    <Generator>MSBuild:Compile</Generator>

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Constants/App.cs

@@ -3,6 +3,8 @@
     public static class App
     {
         public const string AppAuthor = "Zhe Fang";
+        public const string AppAuthorNicknameEN = "jayfunc";
+        public const string AppAuthorNicknameZH = "摘叶飞镖";
         public const string AppName = "BetterLyrics";
 
         public const string AutoStartupTaskId = "AutoStartup";

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Constants/Link.cs

@@ -4,15 +4,23 @@
     {
         public const string MicrosoftStore = "https://apps.microsoft.com/detail/9p1wcd1p597r";
 
-        public const string GitHub = "https://github.com/jayfunc/BetterLyrics";
-        public const string ShareHub = $"{GitHub}/blob/dev/ShareHub/index.md";
-        public const string TermsOfService = $"{GitHub}/blob/dev/TermsofService.md";
-        public const string PrivacyPolicy = $"{GitHub}/blob/dev/PrivacyPolicy.md";
-        public const string UserGuide = $"{GitHub}/wiki/User-Guide";
+        public const string AuthorGitHub = "https://github.com/jayfunc";
+        
+        public const string BetterLyricsGitHub = $"{AuthorGitHub}/BetterLyrics";
+        
+        public const string ShareHub = $"{BetterLyricsGitHub}/blob/dev/ShareHub/index.md";
+        public const string TermsOfService = $"{BetterLyricsGitHub}/blob/dev/TermsofService.md";
+        public const string PrivacyPolicy = $"{BetterLyricsGitHub}/blob/dev/PrivacyPolicy.md";
+        public const string UserGuide = $"{BetterLyricsGitHub}/wiki/User-Guide";
+
         public const string AppleMusicCfg = $"{UserGuide}#lyrics-source-configuration";
 
         public const string QQGroup = "https://qun.qq.com/universal-share/share?ac=1&authKey=4Q%2BYTq3wZldYpF5SbS5c19ECFsiYoLZFAIcBNNzYpBUtiEjaZ8sZ%2F%2BnFN0qw3lad&busi_data=eyJncm91cENvZGUiOiIxMDU0NzAwMzg4IiwidG9rZW4iOiJiVnhqemVYN0N5QVc3b1ZkR24wWmZOTUtvUkJoWm1JRWlaWW5iZnlBcXJtZUtGc2FFTHNlUlFZMi9iRm03cWF5IiwidWluIjoiMTM5NTczOTY2MCJ9&data=39UmAihyH_o6CZaOs7nk2mO_lz2ruODoDou6pxxh7utcxP4WF5sbDBDOPvZ_Wqfzeey4441anegsLYQJxkrBAA&svctype=4&tempid=h5_group_info";
         public const string Discord = "https://discord.gg/5yAQPnyCKv";
         public const string Telegram = "https://t.me/+svhSLZ7awPsxNGY1";
+
+        public const string BuyMeACoffee = "https://buymeacoffee.com/founchoo";
+        public const string PayPal = "https://paypal.me/zhefangpay";
+        public const string Afdian = "https://afdian.com/a/jayfunc";
     }
 }

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Controls/AboutControl.xaml

@@ -28,30 +28,37 @@
                             </StackPanel>
                         </dev:SettingsExpander.Header>
                         <dev:SettingsExpander.Description>
-                            <StackPanel
-                                Margin="0,2,0,0"
-                                Orientation="Horizontal"
-                                Spacing="2">
-                                <TextBlock Text="©" />
-                                <HyperlinkButton
-                                    Margin="0,-1,0,0"
-                                    Content="Zhe Fang"
-                                    NavigateUri="https://github.com/jayfunc" />
-                                <TextBlock Text="2025" />
+                            <StackPanel Orientation="Horizontal">
+                                <StackPanel
+                                    Margin="0,2,0,0"
+                                    Orientation="Horizontal"
+                                    Spacing="2">
+                                    <TextBlock Text="©" />
+                                    <HyperlinkButton
+                                        Margin="0,-1,0,0"
+                                        Content="{x:Bind const:App.AppAuthor}"
+                                        NavigateUri="https://github.com/jayfunc" />
+                                    <TextBlock Text="2025" />
+                                </StackPanel>
                             </StackPanel>
                         </dev:SettingsExpander.Description>
-                        <RichTextBlock Foreground="{ThemeResource TextFillColorSecondaryBrush}">
-                            <Paragraph>
-                                <Run x:Uid="SettingsPageVersion" />
-                                <Run Text="{x:Bind helper:MetadataHelper.AppVersion}" />
-                            </Paragraph>
-                        </RichTextBlock>
+                        <StackPanel Orientation="Horizontal" Spacing="6">
+                            <RichTextBlock
+                                Margin="0,-1,0,0"
+                                VerticalAlignment="Center"
+                                Foreground="{ThemeResource TextFillColorSecondaryBrush}">
+                                <Paragraph>
+                                    <Run x:Uid="SettingsPageVersion" />
+                                    <Run Text="{x:Bind helper:MetadataHelper.AppVersion}" />
+                                </Paragraph>
+                            </RichTextBlock>
+                        </StackPanel>
                         <dev:SettingsExpander.Items>
 
                             <dev:SettingsCard HorizontalContentAlignment="Left" ContentAlignment="Left">
                                 <StackPanel Spacing="6">
                                     <StackPanel Margin="-12,0,0,0" Orientation="Horizontal">
-                                        <HyperlinkButton Content="GitHub" NavigateUri="{x:Bind const:Link.GitHub}" />
+                                        <HyperlinkButton Content="GitHub" NavigateUri="{x:Bind const:Link.BetterLyricsGitHub}" />
                                         <HyperlinkButton x:Uid="UserGuide" NavigateUri="{x:Bind const:Link.UserGuide}" />
                                         <HyperlinkButton x:Uid="PrivacyPolicy" NavigateUri="{x:Bind const:Link.PrivacyPolicy}" />
                                         <HyperlinkButton x:Uid="TermsOfService" NavigateUri="{x:Bind const:Link.TermsOfService}" />
@@ -75,14 +82,14 @@
                                 <StackPanel Spacing="6">
                                     <TextBlock x:Uid="SetingsPageDonation" />
                                     <StackPanel Margin="-12,0,0,0" Orientation="Horizontal">
-                                        <HyperlinkButton Content="Buy Me a Coffee" NavigateUri="https://buymeacoffee.com/founchoo" />
-                                        <HyperlinkButton Content="PayPal" NavigateUri="https://paypal.me/zhefangpay" />
-                                        <Button
-                                            Content="支付宝"
-                                            Foreground="{ThemeResource AccentTextFillColorPrimaryBrush}"
-                                            Style="{StaticResource GhostButtonStyle}">
-                                            <Button.Flyout>
-                                                <Flyout>
+                                        <HyperlinkButton Content="Buy Me a Coffee" NavigateUri="{x:Bind const:Link.BuyMeACoffee}" />
+                                        <HyperlinkButton Content="PayPal" NavigateUri="{x:Bind const:Link.PayPal}" />
+                                        <HyperlinkButton
+                                            x:Name="AlipayButton"
+                                            Click="AlipayButton_Click"
+                                            Content="支付宝">
+                                            <HyperlinkButton.ContextFlyout>
+                                                <Flyout x:Name="AlipayFlyout">
                                                     <Flyout.FlyoutPresenterStyle>
                                                         <Style TargetType="FlyoutPresenter">
                                                             <Setter Property="CornerRadius" Value="12" />
@@ -91,14 +98,14 @@
                                                     </Flyout.FlyoutPresenterStyle>
                                                     <Image Height="300" Source="/Assets/Alipay.jpg" />
                                                 </Flyout>
-                                            </Button.Flyout>
-                                        </Button>
-                                        <Button
-                                            Content="微信"
-                                            Foreground="{ThemeResource AccentTextFillColorPrimaryBrush}"
-                                            Style="{StaticResource GhostButtonStyle}">
-                                            <Button.Flyout>
-                                                <Flyout>
+                                            </HyperlinkButton.ContextFlyout>
+                                        </HyperlinkButton>
+                                        <HyperlinkButton
+                                            x:Name="WeChatButton"
+                                            Click="WeChat_Click"
+                                            Content="微信">
+                                            <HyperlinkButton.ContextFlyout>
+                                                <Flyout x:Name="WeChatFlyout">
                                                     <Flyout.FlyoutPresenterStyle>
                                                         <Style TargetType="FlyoutPresenter">
                                                             <Setter Property="CornerRadius" Value="12" />
@@ -107,8 +114,9 @@
                                                     </Flyout.FlyoutPresenterStyle>
                                                     <Image Height="300" Source="/Assets/WeChatReward.png" />
                                                 </Flyout>
-                                            </Button.Flyout>
-                                        </Button>
+                                            </HyperlinkButton.ContextFlyout>
+                                        </HyperlinkButton>
+                                        <HyperlinkButton Content="爱发电" NavigateUri="{x:Bind const:Link.Afdian}" />
                                     </StackPanel>
                                     <StackPanel Orientation="Horizontal" Spacing="6">
                                         <TextBlock Foreground="{ThemeResource TextFillColorSecondaryBrush}" Text="*" />
@@ -120,16 +128,13 @@
                                 </StackPanel>
                             </dev:SettingsCard>
 
-                            <dev:SettingsCard HorizontalContentAlignment="Left" ContentAlignment="Left">
-                                <StackPanel Spacing="6">
-                                    <TextBlock x:Uid="SetingsPageContributors" />
-                                    <StackPanel Margin="-12,0,0,0" Orientation="Horizontal">
-                                        <HyperlinkButton Content="jayfunc" NavigateUri="https://github.com/jayfunc" />
-                                        <HyperlinkButton Content="Raspberry-Monster" NavigateUri="https://github.com/Raspberry-Monster" />
-                                        <HyperlinkButton Content="ZHider" NavigateUri="https://github.com/ZHider" />
-                                        <HyperlinkButton Content="kusutori" NavigateUri="https://github.com/kusutori" />
-                                    </StackPanel>
-                                </StackPanel>
+                            <dev:SettingsCard x:Uid="SettingsPageThanksList">
+                                <Button
+                                    Click="Patron_Click"
+                                    Content="{ui:FontIcon FontSize=16,
+                                                          FontFamily={StaticResource IconFontFamily},
+                                                          Glyph=&#xE7FD;}"
+                                    Style="{StaticResource AccentButtonStyle}" />
                             </dev:SettingsCard>
 
                         </dev:SettingsExpander.Items>
@@ -177,10 +182,6 @@
                         </dev:SettingsExpander.ItemsHeader>
                     </dev:SettingsExpander>
 
-                    <dev:SettingsCard x:Uid="SettingsPageDebugOverlay">
-                        <ToggleSwitch IsOn="{x:Bind ViewModel.IsDebugOverlayEnabled, Mode=TwoWay}" />
-                    </dev:SettingsCard>
-
                     <dev:SettingsCard x:Uid="SettingsPageFixedTimeStep" Visibility="Collapsed">
                         <ToggleSwitch IsOn="{x:Bind ViewModel.AppSettings.AdvancedSettings.IsFixedTimeStep, Mode=TwoWay}" />
                     </dev:SettingsCard>
@@ -198,5 +199,327 @@
             </Grid>
         </ScrollViewer>
 
+        <Grid
+            x:Name="CreditsReel"
+            Background="{ThemeResource AcrylicInAppFillColorDefaultBrush}"
+            Opacity="0"
+            SizeChanged="CreditsReel_SizeChanged"
+            Tapped="CreditsReel_Tapped"
+            Visibility="Collapsed">
+            <Grid.OpacityTransition>
+                <ScalarTransition />
+            </Grid.OpacityTransition>
+            <ScrollViewer
+                x:Name="CreditsReelScrollViewer"
+                ScrollViewer.VerticalScrollBarVisibility="Hidden"
+                ScrollViewer.VerticalScrollMode="Disabled">
+                <RichTextBlock
+                    HorizontalAlignment="Center"
+                    VerticalAlignment="Center"
+                    HorizontalTextAlignment="Center"
+                    LineHeight="28"
+                    PointerEntered="RichTextBlock_PointerEntered"
+                    PointerExited="RichTextBlock_PointerExited">
+
+                    <Paragraph x:Name="CreditsReelHeader" />
+
+                    <!--  贡献者  -->
+                    <Paragraph Margin="0,20,0,0" FontWeight="Bold">
+                        <Run x:Uid="SetingsPageContributors" />
+                    </Paragraph>
+                    <Paragraph>
+                        <Hyperlink NavigateUri="https://github.com/jayfunc">
+                            <Run Text="jayfunc" />
+                        </Hyperlink>
+                    </Paragraph>
+                    <Paragraph>
+                        <Hyperlink NavigateUri="https://github.com/Raspberry-Monster">
+                            <Run Text="Raspberry-Monster" />
+                        </Hyperlink>
+                    </Paragraph>
+                    <Paragraph>
+                        <Hyperlink NavigateUri="https://github.com/ZHider">
+                            <Run Text="ZHider" />
+                        </Hyperlink>
+                    </Paragraph>
+                    <Paragraph>
+                        <Hyperlink NavigateUri="https://github.com/kusutori">
+                            <Run Text="kusutori" />
+                        </Hyperlink>
+                    </Paragraph>
+
+                    <!--  打赏者  -->
+                    <Paragraph Margin="0,20,0,0" FontWeight="Bold">
+                        <Run x:Uid="SettingsPagePatrons" />
+                    </Paragraph>
+                    <Paragraph>
+                        <Run Text="YE" />
+                        <Run Foreground="{ThemeResource TextFillColorSecondaryBrush}" Text="Dec 3, 2025" />
+                    </Paragraph>
+                    <Paragraph>
+                        <Run Text="**玄" />
+                        <Run Foreground="{ThemeResource TextFillColorSecondaryBrush}" Text="Nov 23, 2025" />
+                    </Paragraph>
+                    <Paragraph>
+                        <Run Text="**智" />
+                        <Run Foreground="{ThemeResource TextFillColorSecondaryBrush}" Text="Nov 21, 2025" />
+                    </Paragraph>
+                    <Paragraph>
+                        <Run Text="*鹤" />
+                        <Run Foreground="{ThemeResource TextFillColorSecondaryBrush}" Text="Nov 17, 2025" />
+                    </Paragraph>
+                    <Paragraph>
+                        <Run Text="借过" />
+                        <Run Foreground="{ThemeResource TextFillColorSecondaryBrush}" Text="Nov 2, 2025" />
+                    </Paragraph>
+                    <Paragraph>
+                        <Run Text="**华" />
+                        <Run Foreground="{ThemeResource TextFillColorSecondaryBrush}" Text="Aug 28, 2025" />
+                    </Paragraph>
+                    <Paragraph>
+                        <Run x:Uid="SettingsPageYouNowUsing" FontStyle="Italic" />
+                    </Paragraph>
+
+                    <!--  依赖包  -->
+                    <Paragraph Margin="0,20,0,0" FontWeight="Bold">
+                        <Run x:Uid="SetingsPageDeps" />
+                    </Paragraph>
+                    <Paragraph>
+                        <Hyperlink NavigateUri="https://www.nuget.org/packages/3v.EvtSource">
+                            <Run Text="3v.EvtSource" />
+                        </Hyperlink>
+                    </Paragraph>
+                    <Paragraph>
+                        <Hyperlink NavigateUri="https://www.nuget.org/packages/CommunityToolkit.Labs.WinUI.Controls.OpacityMaskView">
+                            <Run Text="CommunityToolkit.Labs.WinUI.Controls.OpacityMaskView" />
+                        </Hyperlink>
+                    </Paragraph>
+                    <Paragraph>
+                        <Hyperlink NavigateUri="https://www.nuget.org/packages/CommunityToolkit.Labs.WinUI.Shimmer">
+                            <Run Text="CommunityToolkit.Labs.WinUI.Shimmer" />
+                        </Hyperlink>
+                    </Paragraph>
+                    <Paragraph>
+                        <Hyperlink NavigateUri="https://www.nuget.org/packages/CommunityToolkit.Mvvm">
+                            <Run Text="CommunityToolkit.Mvvm" />
+                        </Hyperlink>
+                    </Paragraph>
+                    <Paragraph>
+                        <Hyperlink NavigateUri="https://www.nuget.org/packages/CommunityToolkit.WinUI.Behaviors">
+                            <Run Text="CommunityToolkit.WinUI.Behaviors" />
+                        </Hyperlink>
+                    </Paragraph>
+                    <Paragraph>
+                        <Hyperlink NavigateUri="https://www.nuget.org/packages/CommunityToolkit.WinUI.Controls.Primitives">
+                            <Run Text="CommunityToolkit.WinUI.Controls.Primitives" />
+                        </Hyperlink>
+                    </Paragraph>
+                    <Paragraph>
+                        <Hyperlink NavigateUri="https://www.nuget.org/packages/CommunityToolkit.WinUI.Controls.Segmented">
+                            <Run Text="CommunityToolkit.WinUI.Controls.Segmented" />
+                        </Hyperlink>
+                    </Paragraph>
+                    <Paragraph>
+                        <Hyperlink NavigateUri="https://www.nuget.org/packages/CommunityToolkit.WinUI.Converters">
+                            <Run Text="CommunityToolkit.WinUI.Converters" />
+                        </Hyperlink>
+                    </Paragraph>
+                    <Paragraph>
+                        <Hyperlink NavigateUri="https://www.nuget.org/packages/CommunityToolkit.WinUI.Extensions">
+                            <Run Text="CommunityToolkit.WinUI.Extensions" />
+                        </Hyperlink>
+                    </Paragraph>
+                    <Paragraph>
+                        <Hyperlink NavigateUri="https://www.nuget.org/packages/CommunityToolkit.WinUI.Helpers">
+                            <Run Text="CommunityToolkit.WinUI.Helpers" />
+                        </Hyperlink>
+                    </Paragraph>
+                    <Paragraph>
+                        <Hyperlink NavigateUri="https://www.nuget.org/packages/CommunityToolkit.WinUI.Media">
+                            <Run Text="CommunityToolkit.WinUI.Media" />
+                        </Hyperlink>
+                    </Paragraph>
+                    <Paragraph>
+                        <Hyperlink NavigateUri="https://www.nuget.org/packages/CommunityToolkit.WinUI.Triggers">
+                            <Run Text="CommunityToolkit.WinUI.Triggers" />
+                        </Hyperlink>
+                    </Paragraph>
+                    <Paragraph>
+                        <Hyperlink NavigateUri="https://www.nuget.org/packages/ComputeSharp.D2D1.WinUI">
+                            <Run Text="ComputeSharp.D2D1.WinUI" />
+                        </Hyperlink>
+                    </Paragraph>
+                    <Paragraph>
+                        <Hyperlink NavigateUri="https://www.nuget.org/packages/csharp-kana">
+                            <Run Text="csharp-kana" />
+                        </Hyperlink>
+                    </Paragraph>
+                    <Paragraph>
+                        <Hyperlink NavigateUri="https://www.nuget.org/packages/csharp-pinyin">
+                            <Run Text="csharp-pinyin" />
+                        </Hyperlink>
+                    </Paragraph>
+                    <Paragraph>
+                        <Hyperlink NavigateUri="https://www.nuget.org/packages/DevWinUI.Controls">
+                            <Run Text="DevWinUI.Controls" />
+                        </Hyperlink>
+                    </Paragraph>
+                    <Paragraph>
+                        <Hyperlink NavigateUri="https://www.nuget.org/packages/Dubya.WindowsMediaController">
+                            <Run Text="Dubya.WindowsMediaController" />
+                        </Hyperlink>
+                    </Paragraph>
+                    <Paragraph>
+                        <Hyperlink NavigateUri="https://www.nuget.org/packages/F23.StringSimilarity">
+                            <Run Text="F23.StringSimilarity" />
+                        </Hyperlink>
+                    </Paragraph>
+                    <Paragraph>
+                        <Hyperlink NavigateUri="https://www.nuget.org/packages/H.NotifyIcon.WinUI">
+                            <Run Text="H.NotifyIcon.WinUI" />
+                        </Hyperlink>
+                    </Paragraph>
+                    <Paragraph>
+                        <Hyperlink NavigateUri="https://www.nuget.org/packages/Hqub.Last.fm">
+                            <Run Text="Hqub.Last.fm" />
+                        </Hyperlink>
+                    </Paragraph>
+                    <Paragraph>
+                        <Hyperlink NavigateUri="https://www.nuget.org/packages/Lyricify.Lyrics.Helper-NativeAot">
+                            <Run Text="Lyricify.Lyrics.Helper-NativeAot" />
+                        </Hyperlink>
+                    </Paragraph>
+                    <Paragraph>
+                        <Hyperlink NavigateUri="https://www.nuget.org/packages/Microsoft.Extensions.DependencyInjection">
+                            <Run Text="Microsoft.Extensions.DependencyInjection" />
+                        </Hyperlink>
+                    </Paragraph>
+                    <Paragraph>
+                        <Hyperlink NavigateUri="https://www.nuget.org/packages/Microsoft.Extensions.Logging">
+                            <Run Text="Microsoft.Extensions.Logging" />
+                        </Hyperlink>
+                    </Paragraph>
+                    <Paragraph>
+                        <Hyperlink NavigateUri="https://www.nuget.org/packages/Microsoft.Graphics.Win2D">
+                            <Run Text="Microsoft.Graphics.Win2D" />
+                        </Hyperlink>
+                    </Paragraph>
+                    <Paragraph>
+                        <Hyperlink NavigateUri="https://www.nuget.org/packages/Microsoft.Windows.SDK.BuildTools">
+                            <Run Text="Microsoft.Windows.SDK.BuildTools" />
+                        </Hyperlink>
+                    </Paragraph>
+                    <Paragraph>
+                        <Hyperlink NavigateUri="https://www.nuget.org/packages/Microsoft.WindowsAppSDK">
+                            <Run Text="Microsoft.WindowsAppSDK" />
+                        </Hyperlink>
+                    </Paragraph>
+                    <Paragraph>
+                        <Hyperlink NavigateUri="https://www.nuget.org/packages/NAudio.Wasapi">
+                            <Run Text="NAudio.Wasapi" />
+                        </Hyperlink>
+                    </Paragraph>
+                    <Paragraph>
+                        <Hyperlink NavigateUri="https://www.nuget.org/packages/Nito.AsyncEx">
+                            <Run Text="Nito.AsyncEx" />
+                        </Hyperlink>
+                    </Paragraph>
+                    <Paragraph>
+                        <Hyperlink NavigateUri="https://www.nuget.org/packages/Nito.AsyncEx.Tasks">
+                            <Run Text="Nito.AsyncEx.Tasks" />
+                        </Hyperlink>
+                    </Paragraph>
+                    <Paragraph>
+                        <Hyperlink NavigateUri="https://www.nuget.org/packages/NTextCat">
+                            <Run Text="NTextCat" />
+                        </Hyperlink>
+                    </Paragraph>
+                    <Paragraph>
+                        <Hyperlink NavigateUri="https://www.nuget.org/packages/Serilog.Extensions.Logging">
+                            <Run Text="Serilog.Extensions.Logging" />
+                        </Hyperlink>
+                    </Paragraph>
+                    <Paragraph>
+                        <Hyperlink NavigateUri="https://www.nuget.org/packages/Serilog.Sinks.File">
+                            <Run Text="Serilog.Sinks.File" />
+                        </Hyperlink>
+                    </Paragraph>
+                    <Paragraph>
+                        <Hyperlink NavigateUri="https://www.nuget.org/packages/System.Drawing.Common">
+                            <Run Text="System.Drawing.Common" />
+                        </Hyperlink>
+                    </Paragraph>
+                    <Paragraph>
+                        <Hyperlink NavigateUri="https://www.nuget.org/packages/System.Text.Encoding.CodePages">
+                            <Run Text="System.Text.Encoding.CodePages" />
+                        </Hyperlink>
+                    </Paragraph>
+                    <Paragraph>
+                        <Hyperlink NavigateUri="https://www.nuget.org/packages/TagLibSharp">
+                            <Run Text="TagLibSharp" />
+                        </Hyperlink>
+                    </Paragraph>
+                    <Paragraph>
+                        <Hyperlink NavigateUri="https://www.nuget.org/packages/Ude.NetStandard">
+                            <Run Text="Ude.NetStandard" />
+                        </Hyperlink>
+                    </Paragraph>
+                    <Paragraph>
+                        <Hyperlink NavigateUri="https://www.nuget.org/packages/Vanara.PInvoke.DwmApi">
+                            <Run Text="Vanara.PInvoke.DwmApi" />
+                        </Hyperlink>
+                    </Paragraph>
+                    <Paragraph>
+                        <Hyperlink NavigateUri="https://www.nuget.org/packages/Vanara.PInvoke.Gdi32">
+                            <Run Text="Vanara.PInvoke.Gdi32" />
+                        </Hyperlink>
+                    </Paragraph>
+                    <Paragraph>
+                        <Hyperlink NavigateUri="https://www.nuget.org/packages/Vanara.PInvoke.Shell32">
+                            <Run Text="Vanara.PInvoke.Shell32" />
+                        </Hyperlink>
+                    </Paragraph>
+                    <Paragraph>
+                        <Hyperlink NavigateUri="https://www.nuget.org/packages/Vanara.PInvoke.User32">
+                            <Run Text="Vanara.PInvoke.User32" />
+                        </Hyperlink>
+                    </Paragraph>
+                    <Paragraph>
+                        <Hyperlink NavigateUri="https://www.nuget.org/packages/Vanara.Windows.Shell">
+                            <Run Text="Vanara.Windows.Shell" />
+                        </Hyperlink>
+                    </Paragraph>
+                    <Paragraph>
+                        <Hyperlink NavigateUri="https://www.nuget.org/packages/VCollab.DiscordRichPresence">
+                            <Run Text="VCollab.DiscordRichPresence" />
+                        </Hyperlink>
+                    </Paragraph>
+                    <Paragraph>
+                        <Hyperlink NavigateUri="https://www.nuget.org/packages/WinUIEx">
+                            <Run Text="WinUIEx" />
+                        </Hyperlink>
+                    </Paragraph>
+                    <Paragraph>
+                        <Hyperlink NavigateUri="https://www.nuget.org/packages/z440.atl.core">
+                            <Run Text="z440.atl.core" />
+                        </Hyperlink>
+                    </Paragraph>
+
+                    <Paragraph Margin="0,20,0,0" FontWeight="Bold">
+                        <Run Text="{x:Bind const:App.AppName}" />
+                    </Paragraph>
+                    <Paragraph>
+                        <Run Text="Proudly built by" />
+                        <Hyperlink NavigateUri="{x:Bind const:Link.AuthorGitHub}">
+                            <Run Text="{x:Bind const:App.AppAuthor}" />
+                        </Hyperlink>
+                    </Paragraph>
+
+                    <Paragraph x:Name="CreditsReelFooter" />
+
+                </RichTextBlock>
+            </ScrollViewer>
+        </Grid>
+
     </Grid>
 </UserControl>

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Controls/AboutControl.xaml.cs

@@ -1,6 +1,9 @@
 using BetterLyrics.WinUI3.ViewModels;
 using CommunityToolkit.Mvvm.DependencyInjection;
 using Microsoft.UI.Xaml.Controls;
+using Microsoft.UI.Xaml.Media;
+using System.Threading.Tasks;
+using Windows.UI.ApplicationSettings;
 
 // To learn more about WinUI, the WinUI project structure,
 // and more about our project templates, see: http://aka.ms/winui-project-info.
@@ -9,6 +12,7 @@ namespace BetterLyrics.WinUI3.Controls
 {
     public sealed partial class AboutControl : UserControl
     {
+        private bool _isCreditsScrolling = false;
         public AboutControlViewModel ViewModel => (AboutControlViewModel)DataContext;
 
         public AboutControl()
@@ -16,5 +20,56 @@ namespace BetterLyrics.WinUI3.Controls
             InitializeComponent();
             DataContext = Ioc.Default.GetRequiredService<AboutControlViewModel>();
         }
+
+        private async void Patron_Click(object sender, Microsoft.UI.Xaml.RoutedEventArgs e)
+        {
+            CompositionTarget.Rendering += CompositionTarget_Rendering;
+            CreditsReel.Visibility = Microsoft.UI.Xaml.Visibility.Visible;
+            CreditsReel.Opacity = 1;
+            _isCreditsScrolling = true;
+        }
+
+        private void CompositionTarget_Rendering(object? sender, object e)
+        {
+            if (_isCreditsScrolling)
+            {
+                CreditsReelScrollViewer.ChangeView(null, CreditsReelScrollViewer.VerticalOffset + 0.5, null);
+            }
+        }
+
+        private async void CreditsReel_Tapped(object sender, Microsoft.UI.Xaml.Input.TappedRoutedEventArgs e)
+        {
+            CreditsReel.Opacity = 0;
+            await Task.Delay(Constants.Time.AnimationDuration);
+            CreditsReel.Visibility = Microsoft.UI.Xaml.Visibility.Collapsed;
+            CompositionTarget.Rendering -= CompositionTarget_Rendering;
+            CreditsReelScrollViewer.ChangeView(null, 0, null);
+        }
+
+        private void CreditsReel_SizeChanged(object sender, Microsoft.UI.Xaml.SizeChangedEventArgs e)
+        {
+            CreditsReelHeader.LineHeight = e.NewSize.Height;
+            CreditsReelFooter.LineHeight = e.NewSize.Height / 2;
+        }
+
+        private void RichTextBlock_PointerEntered(object sender, Microsoft.UI.Xaml.Input.PointerRoutedEventArgs e)
+        {
+            _isCreditsScrolling = false;
+        }
+
+        private void RichTextBlock_PointerExited(object sender, Microsoft.UI.Xaml.Input.PointerRoutedEventArgs e)
+        {
+            _isCreditsScrolling = true;
+        }
+
+        private void WeChat_Click(object sender, Microsoft.UI.Xaml.RoutedEventArgs e)
+        {
+            WeChatFlyout.ShowAt(WeChatButton);
+        }
+
+        private void AlipayButton_Click(object sender, Microsoft.UI.Xaml.RoutedEventArgs e)
+        {
+            AlipayFlyout.ShowAt(AlipayButton);
+        }
     }
 }

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Controls/AlbumArtAreaEffectSettingsControl.xaml

@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<UserControl
+    x:Class="BetterLyrics.WinUI3.Controls.AlbumArtAreaEffectSettingsControl"
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+    xmlns:dev="using:DevWinUI"
+    xmlns:local="using:BetterLyrics.WinUI3.Controls"
+    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    xmlns:ui="using:CommunityToolkit.WinUI"
+    mc:Ignorable="d">
+
+    <Grid>
+        <ScrollViewer Style="{StaticResource SettingsScrollViewerStyle}">
+            <Grid Style="{StaticResource SettingsGridStyle}">
+                <StackPanel Spacing="{StaticResource SettingsCardSpacing}">
+
+                    <TextBlock x:Uid="SettingsPageAlbumEffect" Style="{StaticResource SettingsSectionHeaderTextBlockStyle}" />
+
+                    <dev:SettingsCard x:Uid="SettingsPageImageSwitchType" HeaderIcon="{ui:FontIcon FontFamily={StaticResource IconFontFamily}, Glyph=&#xE8EB;}">
+                        <ComboBox SelectedIndex="{x:Bind AlbumArtAreaEffectSettings.ImageSwitchType, Mode=TwoWay, Converter={StaticResource EnumToIntConverter}}">
+                            <ComboBoxItem x:Uid="SettingsPageCrossfade" />
+                            <ComboBoxItem x:Uid="SettingsPageSlide" />
+                        </ComboBox>
+                    </dev:SettingsCard>
+
+                </StackPanel>
+            </Grid>
+        </ScrollViewer>
+    </Grid>
+</UserControl>

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Controls/AlbumArtAreaEffectSettingsControl.xaml.cs

@@ -0,0 +1,25 @@
+using BetterLyrics.WinUI3.Models.Settings;
+using Microsoft.UI.Xaml;
+using Microsoft.UI.Xaml.Controls;
+
+// To learn more about WinUI, the WinUI project structure,
+// and more about our project templates, see: http://aka.ms/winui-project-info.
+
+namespace BetterLyrics.WinUI3.Controls;
+
+public sealed partial class AlbumArtAreaEffectSettingsControl : UserControl
+{
+    public static readonly DependencyProperty AlbumArtAreaEffectSettingsProperty =
+    DependencyProperty.Register(nameof(AlbumArtAreaEffectSettings), typeof(AlbumArtAreaEffectSettings), typeof(AlbumArtAreaEffectSettingsControl), new PropertyMetadata(default));
+
+    public AlbumArtAreaEffectSettings AlbumArtAreaEffectSettings
+    {
+        get => (AlbumArtAreaEffectSettings)GetValue(AlbumArtAreaEffectSettingsProperty);
+        set => SetValue(AlbumArtAreaEffectSettingsProperty, value);
+    }
+
+    public AlbumArtAreaEffectSettingsControl()
+    {
+        InitializeComponent();
+    }
+}

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Controls/AlbumArtAreaStyleSettingsControl.xaml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <UserControl
-    x:Class="BetterLyrics.WinUI3.Controls.AlbumArtLayoutSettingsControl"
+    x:Class="BetterLyrics.WinUI3.Controls.AlbumArtAreaStyleSettingsControl"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:controls="using:CommunityToolkit.WinUI.Controls"
@@ -16,8 +16,9 @@
             <Grid Style="{StaticResource SettingsGridStyle}">
                 <StackPanel Spacing="{StaticResource SettingsCardSpacing}">
 
-                    <TextBlock Style="{StaticResource SettingsSectionHeaderTextBlockStyle}" />
+                    <TextBlock x:Uid="SettingsPageAlbumStyle" Style="{StaticResource SettingsSectionHeaderTextBlockStyle}" />
 
+                    <!--  整体对齐  -->
                     <dev:SettingsCard x:Uid="SettingsPageAlignment" HeaderIcon="{ui:FontIcon FontFamily={StaticResource IconFontFamily}, Glyph=&#xE8E3;}">
                         <ComboBox SelectedIndex="{x:Bind AlbumArtLayoutSettings.SongInfoAlignmentType, Mode=TwoWay, Converter={StaticResource EnumToIntConverter}}">
                             <ComboBoxItem x:Uid="SettingsPageLeft" />
@@ -28,6 +29,26 @@
 
                     <TextBlock x:Uid="SettingsPageAlbumArt" Style="{StaticResource SettingsSectionHeaderTextBlockStyle}" />
 
+                    <!--  专辑高度  -->
+                    <dev:SettingsExpander
+                        x:Uid="SettingsPageAlbumArtHeight"
+                        HeaderIcon="{ui:FontIcon FontFamily={StaticResource IconFontFamily},
+                                                 Glyph=&#xE784;}"
+                        IsExpanded="True">
+                        <dev:SettingsExpander.Items>
+                            <dev:SettingsCard x:Uid="SettingsPageAutoAdjust">
+                                <ToggleSwitch IsOn="{x:Bind AlbumArtLayoutSettings.IsAutoCoverImageHeight, Mode=TwoWay}" />
+                            </dev:SettingsCard>
+                            <dev:SettingsCard IsEnabled="{x:Bind AlbumArtLayoutSettings.IsAutoCoverImageHeight, Converter={StaticResource BoolNegationConverter}, Mode=OneWay}">
+                                <NumberBox
+                                    Minimum="0"
+                                    SpinButtonPlacementMode="Inline"
+                                    Value="{x:Bind AlbumArtLayoutSettings.CoverImageHeight, Mode=TwoWay}" />
+                            </dev:SettingsCard>
+                        </dev:SettingsExpander.Items>
+                    </dev:SettingsExpander>
+
+                    <!--  专辑圆角  -->
                     <dev:SettingsCard x:Uid="SettingsPageAlbumRadius" HeaderIcon="{ui:FontIcon FontFamily={StaticResource IconFontFamily}, Glyph=&#xEA3A;}">
                         <local:ExtendedSlider
                             Default="12"
@@ -37,6 +58,7 @@
                             Value="{x:Bind AlbumArtLayoutSettings.CoverImageRadius, Mode=TwoWay}" />
                     </dev:SettingsCard>
 
+                    <!--  专辑阴影  -->
                     <dev:SettingsCard x:Uid="SettingsPageAlbumShadowAmount" HeaderIcon="{ui:FontIcon FontFamily={StaticResource IconFontFamily}, Glyph=&#xF5EF;}">
                         <local:ExtendedSlider
                             Default="12"

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Controls/AlbumArtAreaStyleSettingsControl.xaml.cs

@@ -7,18 +7,18 @@ using Microsoft.UI.Xaml.Controls;
 
 namespace BetterLyrics.WinUI3.Controls
 {
-    public sealed partial class AlbumArtLayoutSettingsControl : UserControl
+    public sealed partial class AlbumArtAreaStyleSettingsControl : UserControl
     {
         public static readonly DependencyProperty AlbumArtLayoutSettingsProperty =
-            DependencyProperty.Register(nameof(AlbumArtLayoutSettings), typeof(AlbumArtLayoutSettings), typeof(AlbumArtLayoutSettingsControl), new PropertyMetadata(default));
+            DependencyProperty.Register(nameof(AlbumArtLayoutSettings), typeof(AlbumArtAreaStyleSettings), typeof(AlbumArtAreaStyleSettingsControl), new PropertyMetadata(default));
 
-        public AlbumArtLayoutSettings AlbumArtLayoutSettings
+        public AlbumArtAreaStyleSettings AlbumArtLayoutSettings
         {
-            get => (AlbumArtLayoutSettings)GetValue(AlbumArtLayoutSettingsProperty);
+            get => (AlbumArtAreaStyleSettings)GetValue(AlbumArtLayoutSettingsProperty);
             set => SetValue(AlbumArtLayoutSettingsProperty, value);
         }
 
-        public AlbumArtLayoutSettingsControl()
+        public AlbumArtAreaStyleSettingsControl()
         {
             InitializeComponent();
         }

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Controls/AppSettingsControl.xaml

@@ -44,9 +44,9 @@
                         </dev:SettingsExpander.Items>
                     </dev:SettingsExpander>
 
-                    <!--  App behavior  -->
+                    <!--  Startup  -->
 
-                    <TextBlock x:Uid="SettingsPageAppBehavior" Style="{StaticResource SettingsSectionHeaderTextBlockStyle}" />
+                    <TextBlock x:Uid="SettingsPageStartup" Style="{StaticResource SettingsSectionHeaderTextBlockStyle}" />
 
                     <dev:SettingsCard x:Uid="SettingsPageAutoStart" HeaderIcon="{ui:FontIcon FontFamily={StaticResource IconFontFamily}, Glyph=&#xF71C;}">
                         <ToggleSwitch
@@ -59,42 +59,42 @@
                         <ToggleSwitch IsOn="{x:Bind ViewModel.AppSettings.MusicGallerySettings.AutoOpen, Mode=TwoWay}" />
                     </dev:SettingsCard>
 
+                    <dev:SettingsCard x:Uid="SettingsPageAutoOpenLyricsWindow" HeaderIcon="{ui:FontIcon FontFamily={StaticResource IconFontFamily}, Glyph=&#xE90B;}">
+                        <ToggleSwitch IsOn="{x:Bind ViewModel.AppSettings.GeneralSettings.AutoStartLyricsWindow, Mode=TwoWay}" />
+                    </dev:SettingsCard>
+
+                    <!--  Music gallery window  -->
+
+                    <TextBlock x:Uid="SettingsPageMusicGallery" Style="{StaticResource SettingsSectionHeaderTextBlockStyle}" />
+
                     <dev:SettingsCard x:Uid="SettingsPageAutoPlayWhenOpenMusicGalleryWindow" HeaderIcon="{ui:FontIcon FontFamily={StaticResource IconFontFamily}, Glyph=&#xE768;}">
                         <ToggleSwitch IsOn="{x:Bind ViewModel.AppSettings.MusicGallerySettings.AutoPlay, Mode=TwoWay}" />
                     </dev:SettingsCard>
 
+                    <dev:SettingsCard x:Uid="SettingsPageExitOnGalleryWindowClosed" HeaderIcon="{ui:FontIcon FontFamily={StaticResource IconFontFamily}, Glyph=&#xE711;}">
+                        <ToggleSwitch IsOn="{x:Bind ViewModel.AppSettings.MusicGallerySettings.ExitOnWindowClosed, Mode=TwoWay}" />
+                    </dev:SettingsCard>
+
+                    <!--  Lyrics window  -->
+
+                    <TextBlock x:Uid="SettingsPageLyricsWindow" Style="{StaticResource SettingsSectionHeaderTextBlockStyle}" />
+
                     <dev:SettingsCard x:Uid="SettingsPageExitOnLyricsWindowClosed" HeaderIcon="{ui:FontIcon FontFamily={StaticResource IconFontFamily}, Glyph=&#xE711;}">
                         <ToggleSwitch IsOn="{x:Bind ViewModel.AppSettings.GeneralSettings.ExitOnLyricsWindowClosed, Mode=TwoWay}" />
                     </dev:SettingsCard>
 
-                    <dev:SettingsCard x:Uid="SettingsPageListenNewSession" HeaderIcon="{ui:FontIcon FontFamily={StaticResource IconFontFamily}, Glyph=&#xF270;}">
-                        <ToggleSwitch IsOn="{x:Bind ViewModel.AppSettings.GeneralSettings.ListenOnNewPlaybackSource, Mode=TwoWay}" />
-                    </dev:SettingsCard>
+                    <!--  Playback shortcut  -->
 
-                    <dev:SettingsCard x:Uid="LyricsSearchControlIgnoreCache" HeaderIcon="{ui:FontIcon FontFamily={StaticResource IconFontFamily}, Glyph=&#xE8D8;}">
-                        <ToggleSwitch IsOn="{x:Bind ViewModel.AppSettings.GeneralSettings.IgnoreCacheWhenSearching, Mode=TwoWay}" />
-                    </dev:SettingsCard>
+                    <TextBlock x:Uid="SettingsPageShortcut" Style="{StaticResource SettingsSectionHeaderTextBlockStyle}" />
 
                     <dev:SettingsCard x:Uid="SettingsPageShowHideHotKey" HeaderIcon="{ui:FontIcon FontFamily={StaticResource IconFontFamily}, Glyph=&#xEDA7;}">
                         <local:ShortcutTextBox Shortcut="{x:Bind ViewModel.AppSettings.GeneralSettings.ShowOrHideLyricsWindowShortcut, Mode=TwoWay}" />
                     </dev:SettingsCard>
 
-                    <dev:SettingsCard x:Uid="SettingsPageBorderlessHotKey" HeaderIcon="{ui:FontIcon FontFamily={StaticResource IconFontFamily}, Glyph=&#xEDA7;}">
-                        <local:ShortcutTextBox Shortcut="{x:Bind ViewModel.AppSettings.GeneralSettings.BorderlessShortcut, Mode=TwoWay}" />
-                    </dev:SettingsCard>
-
-                    <dev:SettingsCard x:Uid="SettingsPageClickThroughHotKey" HeaderIcon="{ui:FontIcon FontFamily={StaticResource IconFontFamily}, Glyph=&#xEDA7;}">
-                        <local:ShortcutTextBox Shortcut="{x:Bind ViewModel.AppSettings.GeneralSettings.ClickThroughShortcut, Mode=TwoWay}" />
-                    </dev:SettingsCard>
-
                     <dev:SettingsCard x:Uid="SettingsPageLyricsWindowSwitchHotKey" HeaderIcon="{ui:FontIcon FontFamily={StaticResource IconFontFamily}, Glyph=&#xEDA7;}">
                         <local:ShortcutTextBox Shortcut="{x:Bind ViewModel.AppSettings.GeneralSettings.LyricsWindowSwitchShortcut, Mode=TwoWay}" />
                     </dev:SettingsCard>
 
-                    <!--  Playback shortcut  -->
-
-                    <TextBlock x:Uid="SettingsPagePlaybackShortcut" Style="{StaticResource SettingsSectionHeaderTextBlockStyle}" />
-
                     <dev:SettingsCard x:Uid="SettingsPagePlayOrPauseSongHotKey" HeaderIcon="{ui:FontIcon FontFamily={StaticResource IconFontFamily}, Glyph=&#xEDA7;}">
                         <local:ShortcutTextBox Shortcut="{x:Bind ViewModel.AppSettings.GeneralSettings.PlayOrPauseShortcut, Mode=TwoWay}" />
                     </dev:SettingsCard>

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Controls/FontFamilyAutoSuggestBox.xaml.cs

@@ -4,12 +4,8 @@ using BetterLyrics.WinUI3.Services.SettingsService;
 using CommunityToolkit.Mvvm.DependencyInjection;
 using Microsoft.UI.Xaml;
 using Microsoft.UI.Xaml.Controls;
-using Microsoft.UI.Xaml.Media;
 using System.Collections.Generic;
-using System.Collections.Immutable;
-using System.Collections.ObjectModel;
 using System.Linq;
-using System.Threading.Tasks;
 
 // To learn more about WinUI, the WinUI project structure,
 // and more about our project templates, see: http://aka.ms/winui-project-info.

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Controls/ImageSwitcher.xaml

@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<UserControl
+    x:Class="BetterLyrics.WinUI3.Controls.ImageSwitcher"
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:const="using:BetterLyrics.WinUI3.Constants"
+    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+    xmlns:local="using:BetterLyrics.WinUI3.Controls"
+    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    mc:Ignorable="d">
+
+    <Grid>
+        <Grid.OpacityTransition>
+            <ScalarTransition Duration="{x:Bind const:Time.AnimationDuration}" />
+        </Grid.OpacityTransition>
+        <local:ShadowImage
+            x:Name="LastAlbumArtImage"
+            HorizontalAlignment="Center"
+            VerticalAlignment="Center"
+            CornerRadiusAmount="{x:Bind CornerRadiusAmount, Mode=OneWay}"
+            ShadowAmount="{x:Bind ShadowAmount, Mode=OneWay}" />
+        <local:ShadowImage
+            x:Name="AlbumArtImage"
+            HorizontalAlignment="Center"
+            VerticalAlignment="Center"
+            CornerRadiusAmount="{x:Bind CornerRadiusAmount, Mode=OneWay}"
+            ShadowAmount="{x:Bind ShadowAmount, Mode=OneWay}" />
+    </Grid>
+</UserControl>

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Controls/ImageSwitcher.xaml.cs

@@ -0,0 +1,133 @@
+using BetterLyrics.WinUI3.Enums;
+using Microsoft.UI.Xaml;
+using Microsoft.UI.Xaml.Controls;
+using Microsoft.UI.Xaml.Media;
+
+// To learn more about WinUI, the WinUI project structure,
+// and more about our project templates, see: http://aka.ms/winui-project-info.
+
+namespace BetterLyrics.WinUI3.Controls;
+
+public sealed partial class ImageSwitcher : UserControl
+{
+    public int CornerRadiusAmount
+    {
+        get { return (int)GetValue(CornerRadiusAmountProperty); }
+        set { SetValue(CornerRadiusAmountProperty, value); }
+    }
+
+    public static readonly DependencyProperty CornerRadiusAmountProperty =
+        DependencyProperty.Register(nameof(CornerRadiusAmount), typeof(int), typeof(ImageSwitcher), new PropertyMetadata(0));
+
+    public int ShadowAmount
+    {
+        get { return (int)GetValue(ShadowAmountProperty); }
+        set { SetValue(ShadowAmountProperty, value); }
+    }
+
+    public static readonly DependencyProperty ShadowAmountProperty =
+        DependencyProperty.Register(nameof(ShadowAmount), typeof(int), typeof(ImageSwitcher), new PropertyMetadata(0));
+
+    public ImageSource? Source
+    {
+        get { return (ImageSource?)GetValue(SourceProperty); }
+        set { SetValue(SourceProperty, value); }
+    }
+
+    public static readonly DependencyProperty SourceProperty =
+        DependencyProperty.Register(nameof(Source), typeof(ImageSource), typeof(ImageSwitcher), new PropertyMetadata(null, OnDependencyPropertyChanged));
+
+    public ImageSwitchType SwitchType
+    {
+        get { return (ImageSwitchType)GetValue(SwitchTypeProperty); }
+        set { SetValue(SwitchTypeProperty, value); }
+    }
+
+    public static readonly DependencyProperty SwitchTypeProperty =
+        DependencyProperty.Register(nameof(SwitchType), typeof(ImageSwitchType), typeof(ImageSwitcher), new PropertyMetadata(ImageSwitchType.Crossfade));
+
+    public ImageSwitcher()
+    {
+        InitializeComponent();
+    }
+
+    private void UpdateSource()
+    {
+        switch (SwitchType)
+        {
+            case ImageSwitchType.Crossfade:
+                UpdateSourceCrossfade();
+                break;
+            case ImageSwitchType.Slide:
+                UpdateSourceSlide();
+                break;
+            default:
+                break;
+        }
+    }
+
+    private void UpdateSourceCrossfade()
+    {
+        // Ϊ<><CEAA><EFBFBD><EFBFBD>ͼƬ<CDBC><C6AC><EFBFBD>þ<EFBFBD>Դ
+        LastAlbumArtImage.Source = AlbumArtImage.Source;
+        // ʹ<><CAB9><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ɼ<EFBFBD>
+        LastAlbumArtImage.TranslationTransition = null;
+        LastAlbumArtImage.OpacityTransition = null;
+        LastAlbumArtImage.Translation = new();
+        LastAlbumArtImage.Opacity = 1;
+        LastAlbumArtImage.OpacityTransition = new ScalarTransition { Duration = Constants.Time.AnimationDuration };
+
+        // ʹǰ<CAB9><C7B0>ͼƬ<CDBC><C6AC><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ɼ<EFBFBD>
+        AlbumArtImage.TranslationTransition = null;
+        AlbumArtImage.OpacityTransition = null;
+        AlbumArtImage.Translation = new();
+        AlbumArtImage.Opacity = 0;
+        AlbumArtImage.OpacityTransition = new ScalarTransition { Duration = Constants.Time.AnimationDuration };
+        // ֮<><D6AE>Ϊ<EFBFBD><CEAA><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Դ
+        AlbumArtImage.Source = Source;
+
+        // <20><><EFBFBD>浭<EFBFBD><E6B5AD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
+        LastAlbumArtImage.Opacity = 0;
+        AlbumArtImage.Opacity = 1;
+    }
+
+    private void UpdateSourceSlide()
+    {
+        // Ϊ<><CEAA><EFBFBD><EFBFBD>ͼƬ<CDBC><C6AC><EFBFBD>þ<EFBFBD>Դ
+        LastAlbumArtImage.Source = AlbumArtImage.Source;
+        // ʹ<><CAB9><EFBFBD><EFBFBD>λ
+        LastAlbumArtImage.TranslationTransition = null;
+        LastAlbumArtImage.OpacityTransition = null;
+        LastAlbumArtImage.Translation = new();
+        LastAlbumArtImage.Opacity = 1;
+        LastAlbumArtImage.TranslationTransition = new Vector3Transition { Duration = Constants.Time.AnimationDuration };
+        LastAlbumArtImage.OpacityTransition = new ScalarTransition { Duration = Constants.Time.AnimationDuration };
+
+        // ʹǰ<CAB9><C7B0>ͼƬ<CDBC><C6AC><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ɼ<EFBFBD>
+        AlbumArtImage.TranslationTransition = null;
+        AlbumArtImage.OpacityTransition = null;
+        AlbumArtImage.Translation = new(-(float)ActualWidth, 0, 0);
+        AlbumArtImage.Opacity = 0;
+        AlbumArtImage.TranslationTransition = new Vector3Transition { Duration = Constants.Time.AnimationDuration };
+        AlbumArtImage.OpacityTransition = new ScalarTransition { Duration = Constants.Time.AnimationDuration };
+        // ֮<><D6AE>Ϊ<EFBFBD><CEAA><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Դ
+        AlbumArtImage.Source = Source;
+
+        // <20><><EFBFBD><EFBFBD>
+        LastAlbumArtImage.Opacity = 0;
+        AlbumArtImage.Opacity = 1;
+        LastAlbumArtImage.Translation = new(-(float)ActualWidth, 0, 0);
+        AlbumArtImage.Translation = new();
+    }
+
+    private static void OnDependencyPropertyChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
+    {
+        if (d is ImageSwitcher imageSwitcher)
+        {
+            if (e.Property == SourceProperty)
+            {
+                imageSwitcher.UpdateSource();
+            }
+        }
+    }
+}

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Controls/LyricsBackgroundSettingsControl.xaml

@@ -17,7 +17,7 @@
             <Grid Style="{StaticResource SettingsGridStyle}">
                 <StackPanel Spacing="{StaticResource SettingsCardSpacing}">
 
-                    <TextBlock Style="{StaticResource SettingsSectionHeaderTextBlockStyle}" />
+                    <TextBlock x:Uid="SettingsPageBackgroundOverlay" Style="{StaticResource SettingsSectionHeaderTextBlockStyle}" />
 
                     <dev:SettingsCard x:Uid="SettingsPageTheme" HeaderIcon="{ui:FontIcon FontFamily={StaticResource IconFontFamily}, Glyph=&#xE790;}">
                         <ComboBox x:Name="ThemeComboBox" SelectedIndex="{x:Bind LyricsBackgroundSettings.LyricsBackgroundTheme, Mode=TwoWay, Converter={StaticResource EnumToIntConverter}}">

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Controls/LyricsCanvas.xaml.cs

@@ -8,7 +8,6 @@ using BetterLyrics.WinUI3.Models;
 using BetterLyrics.WinUI3.Models.Settings;
 using BetterLyrics.WinUI3.Renderer;
 using BetterLyrics.WinUI3.Services.LastFMService;
-using BetterLyrics.WinUI3.Services.LiveStatesService;
 using BetterLyrics.WinUI3.Services.MediaSessionsService;
 using BetterLyrics.WinUI3.Services.SettingsService;
 using CommunityToolkit.Mvvm.DependencyInjection;
@@ -19,28 +18,25 @@ using Microsoft.UI;
 using Microsoft.UI.Xaml;
 using Microsoft.UI.Xaml.Controls;
 using System;
+using System.Collections.Generic;
 using System.Linq;
-using System.Numerics;
 using Windows.Foundation;
 using Windows.UI;
 
 namespace BetterLyrics.WinUI3.Controls
 {
     public sealed partial class LyricsCanvas : UserControl,
-        IRecipient<PropertyChangedMessage<int>>,
-        IRecipient<PropertyChangedMessage<AlbumArtThemeColors>>,
         IRecipient<PropertyChangedMessage<TimeSpan>>,
         IRecipient<PropertyChangedMessage<LyricsData?>>,
-        IRecipient<PropertyChangedMessage<LyricsWindowStatus>>,
+        IRecipient<PropertyChangedMessage<SongInfo?>>,
+        IRecipient<PropertyChangedMessage<int>>,
         IRecipient<PropertyChangedMessage<double>>,
         IRecipient<PropertyChangedMessage<bool>>,
         IRecipient<PropertyChangedMessage<TextAlignmentType>>,
-        IRecipient<PropertyChangedMessage<SongInfo?>>,
         IRecipient<PropertyChangedMessage<LyricsFontWeight>>,
         IRecipient<PropertyChangedMessage<string>>
     {
         private readonly ISettingsService _settingsService = Ioc.Default.GetRequiredService<ISettingsService>();
-        private readonly ILiveStatesService _liveStatesService = Ioc.Default.GetRequiredService<ILiveStatesService>();
         private readonly IMediaSessionsService _mediaSessionsService = Ioc.Default.GetRequiredService<IMediaSessionsService>();
         private readonly ILastFMService _lastFMService = Ioc.Default.GetRequiredService<ILastFMService>();
 
@@ -52,7 +48,6 @@ namespace BetterLyrics.WinUI3.Controls
         private readonly SpectrumRenderer _spectrumRenderer = new();
 
         private readonly LyricsSynchronizer _synchronizer = new();
-        private readonly LyricsLayoutManager _layoutManager = new();
         private readonly LyricsAnimator _animator = new();
 
         private readonly SpectrumAnalyzer _spectrumAnalyzer = new();
@@ -97,6 +92,7 @@ namespace BetterLyrics.WinUI3.Controls
             easingType: EasingType.EaseInOutSine
         );
 
+        private TimeSpan _songPositionWithOffset;
         private TimeSpan _songPosition; // <20><>ǰ<EFBFBD><C7B0><EFBFBD><EFBFBD>ʱ<EFBFBD><CAB1>
         private TimeSpan _totalPlayedTime; // <20><>ǰ<EFBFBD><C7B0><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ʱ<EFBFBD><CAB1><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ػ<EFBFBD><D8BB>ظ<EFBFBD><D8B8><EFBFBD><EFBFBD>ŵ<EFBFBD>ʱ<EFBFBD>䣩
         private bool _isLastFMTracked = false;
@@ -107,13 +103,16 @@ namespace BetterLyrics.WinUI3.Controls
         private double _renderLyricsHeight = 0;
         private double _renderLyricsOpacity = 0;
 
+        private LyricsWindowStatus? _lyricsWindowStatus = null;
+        private AlbumArtThemeColors _albumArtThemeColors = new();
+
         private Point _mousePosition = new(0, 0);
         private int _mouseHoverLineIndex = -1;
         private bool _isMouseInLyricsArea = false;
         private bool _isMousePressing = false;
         private bool _isMouseScrolling = false;
 
-        private LyricsData? _lyricsData;
+        private List<RenderLyricsLine>? _renderLyricsLines = null;
 
         private bool _isLayoutChanged = true;
         private bool _isMouseScrollingChanged = false;
@@ -124,9 +123,27 @@ namespace BetterLyrics.WinUI3.Controls
 
         public TimeSpan SongPosition => _songPosition;
         public double CurrentCanvasYScroll => _canvasYScrollTransition.Value;
-        public double ActualLyricsHeight => _layoutManager.CalculateActualHeight(_lyricsData?.LyricsLines);
+        public double ActualLyricsHeight => LyricsLayoutManager.CalculateActualHeight(_renderLyricsLines);
         public int CurrentHoveringLineIndex => _mouseHoverLineIndex;
 
+        public LyricsWindowStatus? LyricsWindowStatus
+        {
+            get { return (LyricsWindowStatus?)GetValue(LyricsWindowStatusProperty); }
+            set { SetValue(LyricsWindowStatusProperty, value); }
+        }
+
+        public static readonly DependencyProperty LyricsWindowStatusProperty =
+            DependencyProperty.Register(nameof(LyricsWindowStatus), typeof(LyricsWindowStatus), typeof(LyricsCanvas), new PropertyMetadata(null, OnDependencyPropertyChanged));
+
+        public AlbumArtThemeColors AlbumArtThemeColors
+        {
+            get { return (AlbumArtThemeColors)GetValue(AlbumArtThemeColorsProperty); }
+            set { SetValue(AlbumArtThemeColorsProperty, value); }
+        }
+
+        public static readonly DependencyProperty AlbumArtThemeColorsProperty =
+            DependencyProperty.Register(nameof(AlbumArtThemeColors), typeof(AlbumArtThemeColors), typeof(LyricsCanvas), new PropertyMetadata(new AlbumArtThemeColors(), OnDependencyPropertyChanged));
+
         // <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ʼ<EFBFBD><CABC> X <20><><EFBFBD><EFBFBD>
         public double LyricsStartX
         {
@@ -135,7 +152,7 @@ namespace BetterLyrics.WinUI3.Controls
         }
 
         public static readonly DependencyProperty LyricsStartXProperty =
-            DependencyProperty.Register(nameof(LyricsStartX), typeof(double), typeof(LyricsCanvas), new PropertyMetadata(0.0, OnLayoutPropChanged));
+            DependencyProperty.Register(nameof(LyricsStartX), typeof(double), typeof(LyricsCanvas), new PropertyMetadata(0.0, OnDependencyPropertyChanged));
 
         // <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ʼ Y <20><><EFBFBD><EFBFBD>
         public double LyricsStartY
@@ -145,7 +162,7 @@ namespace BetterLyrics.WinUI3.Controls
         }
 
         public static readonly DependencyProperty LyricsStartYProperty =
-            DependencyProperty.Register(nameof(LyricsStartY), typeof(double), typeof(LyricsCanvas), new PropertyMetadata(0.0, OnLayoutPropChanged));
+            DependencyProperty.Register(nameof(LyricsStartY), typeof(double), typeof(LyricsCanvas), new PropertyMetadata(0.0, OnDependencyPropertyChanged));
 
         // <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
         public double LyricsWidth
@@ -155,7 +172,7 @@ namespace BetterLyrics.WinUI3.Controls
         }
 
         public static readonly DependencyProperty LyricsWidthProperty =
-            DependencyProperty.Register(nameof(LyricsWidth), typeof(double), typeof(LyricsCanvas), new PropertyMetadata(0.0, OnLayoutPropChanged));
+            DependencyProperty.Register(nameof(LyricsWidth), typeof(double), typeof(LyricsCanvas), new PropertyMetadata(0.0, OnDependencyPropertyChanged));
 
         // <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>߶<EFBFBD>
         public double LyricsHeight
@@ -165,7 +182,7 @@ namespace BetterLyrics.WinUI3.Controls
         }
 
         public static readonly DependencyProperty LyricsHeightProperty =
-            DependencyProperty.Register(nameof(LyricsHeight), typeof(double), typeof(LyricsCanvas), new PropertyMetadata(0.0, OnLayoutPropChanged));
+            DependencyProperty.Register(nameof(LyricsHeight), typeof(double), typeof(LyricsCanvas), new PropertyMetadata(0.0, OnDependencyPropertyChanged));
 
         // <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>͸<EFBFBD><CDB8><EFBFBD><EFBFBD>
         public double LyricsOpacity
@@ -175,7 +192,7 @@ namespace BetterLyrics.WinUI3.Controls
         }
 
         public static readonly DependencyProperty LyricsOpacityProperty =
-            DependencyProperty.Register(nameof(LyricsOpacity), typeof(double), typeof(LyricsCanvas), new PropertyMetadata(0.0, OnLayoutPropChanged));
+            DependencyProperty.Register(nameof(LyricsOpacity), typeof(double), typeof(LyricsCanvas), new PropertyMetadata(0.0, OnDependencyPropertyChanged));
 
         /// <summary>
         /// <20>û<EFBFBD><C3BB>ٿ<EFBFBD><D9BF><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ѹ<EFBFBD><D1B9><EFBFBD><EFBFBD>ľ<EFBFBD><C4BE>루<EFBFBD><EBA3A8> 0 <20><>ʼ<EFBFBD>㣩
@@ -187,7 +204,7 @@ namespace BetterLyrics.WinUI3.Controls
         }
 
         public static readonly DependencyProperty MouseScrollOffsetProperty =
-            DependencyProperty.Register(nameof(MouseScrollOffset), typeof(double), typeof(LyricsCanvas), new PropertyMetadata(0.0, OnLayoutPropChanged));
+            DependencyProperty.Register(nameof(MouseScrollOffset), typeof(double), typeof(LyricsCanvas), new PropertyMetadata(0.0, OnDependencyPropertyChanged));
 
         /// <summary>
         /// <20>û<EFBFBD><C3BB><EFBFBD><EFBFBD>굱ǰ<EAB5B1><C7B0>λ<EFBFBD>ã<EFBFBD><C3A3><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ڸ<EFBFBD><DAB8><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Ͻǣ<CFBD>
@@ -199,7 +216,7 @@ namespace BetterLyrics.WinUI3.Controls
         }
 
         public static readonly DependencyProperty MousePositionProperty =
-            DependencyProperty.Register(nameof(MousePosition), typeof(Point), typeof(LyricsCanvas), new PropertyMetadata(new Point(0, 0), OnLayoutPropChanged));
+            DependencyProperty.Register(nameof(MousePosition), typeof(Point), typeof(LyricsCanvas), new PropertyMetadata(new Point(0, 0), OnDependencyPropertyChanged));
 
         public bool IsMouseInLyricsArea
         {
@@ -208,7 +225,7 @@ namespace BetterLyrics.WinUI3.Controls
         }
 
         public static readonly DependencyProperty IsMouseInLyricsAreaProperty =
-            DependencyProperty.Register(nameof(IsMouseInLyricsArea), typeof(bool), typeof(LyricsCanvas), new PropertyMetadata(false, OnLayoutPropChanged));
+            DependencyProperty.Register(nameof(IsMouseInLyricsArea), typeof(bool), typeof(LyricsCanvas), new PropertyMetadata(false, OnDependencyPropertyChanged));
 
         public bool IsMousePressing
         {
@@ -217,7 +234,7 @@ namespace BetterLyrics.WinUI3.Controls
         }
 
         public static readonly DependencyProperty IsMousePressingProperty =
-            DependencyProperty.Register(nameof(IsMousePressing), typeof(bool), typeof(LyricsCanvas), new PropertyMetadata(false, OnLayoutPropChanged));
+            DependencyProperty.Register(nameof(IsMousePressing), typeof(bool), typeof(LyricsCanvas), new PropertyMetadata(false, OnDependencyPropertyChanged));
 
         public bool IsMouseScrolling
         {
@@ -226,30 +243,27 @@ namespace BetterLyrics.WinUI3.Controls
         }
 
         public static readonly DependencyProperty IsMouseScrollingProperty =
-            DependencyProperty.Register(nameof(IsMouseScrolling), typeof(bool), typeof(LyricsCanvas), new PropertyMetadata(false, OnLayoutPropChanged));
+            DependencyProperty.Register(nameof(IsMouseScrolling), typeof(bool), typeof(LyricsCanvas), new PropertyMetadata(false, OnDependencyPropertyChanged));
 
         public LyricsCanvas()
         {
             InitializeComponent();
 
-            WeakReferenceMessenger.Default.Register<PropertyChangedMessage<int>>(this);
-            WeakReferenceMessenger.Default.Register<PropertyChangedMessage<AlbumArtThemeColors>>(this);
-            WeakReferenceMessenger.Default.Register<PropertyChangedMessage<TimeSpan>>(this);
-            WeakReferenceMessenger.Default.Register<PropertyChangedMessage<LyricsData?>>(this);
-            WeakReferenceMessenger.Default.Register<PropertyChangedMessage<LyricsWindowStatus>>(this);
-            WeakReferenceMessenger.Default.Register<PropertyChangedMessage<double>>(this);
-            WeakReferenceMessenger.Default.Register<PropertyChangedMessage<bool>>(this);
-            WeakReferenceMessenger.Default.Register<PropertyChangedMessage<TextAlignmentType>>(this);
-            WeakReferenceMessenger.Default.Register<PropertyChangedMessage<SongInfo?>>(this);
-            WeakReferenceMessenger.Default.Register<PropertyChangedMessage<LyricsFontWeight>>(this);
-            WeakReferenceMessenger.Default.Register<PropertyChangedMessage<string>>(this);
+            WeakReferenceMessenger.Default.RegisterAll(this);
+
+            UpdateRenderLyricsLines();
         }
 
-        private static void OnLayoutPropChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
+        private static void OnDependencyPropertyChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
         {
             if (d is LyricsCanvas canvas)
             {
-                if (e.Property == LyricsStartXProperty)
+                if (e.Property == LyricsWindowStatusProperty)
+                {
+                    canvas._lyricsWindowStatus = (LyricsWindowStatus)e.NewValue;
+                    canvas._isLayoutChanged = true;
+                }
+                else if (e.Property == LyricsStartXProperty)
                 {
                     canvas._renderLyricsStartX = Convert.ToDouble(e.NewValue);
                     canvas._isLayoutChanged = true;
@@ -299,6 +313,18 @@ namespace BetterLyrics.WinUI3.Controls
                     }
                     canvas._isMouseScrolling = value;
                 }
+                else if (e.Property == AlbumArtThemeColorsProperty)
+                {
+                    var albumArtThemeColors = (AlbumArtThemeColors)e.NewValue;
+                    canvas._immersiveBgColorTransition.StartTransition(albumArtThemeColors.EnvColor);
+                    canvas._accentColor1Transition.StartTransition(albumArtThemeColors.AccentColor1);
+                    canvas._accentColor2Transition.StartTransition(albumArtThemeColors.AccentColor2);
+                    canvas._accentColor3Transition.StartTransition(albumArtThemeColors.AccentColor3);
+                    canvas._accentColor4Transition.StartTransition(albumArtThemeColors.AccentColor4);
+
+                    canvas._albumArtThemeColors = albumArtThemeColors;
+                    canvas._isLayoutChanged = true;
+                }
             }
         }
 
@@ -306,25 +332,22 @@ namespace BetterLyrics.WinUI3.Controls
 
         private void Canvas_Draw(ICanvasAnimatedControl sender, CanvasAnimatedDrawEventArgs args)
         {
+            if (_lyricsWindowStatus == null) return;
+
             var bounds = new Rect(0, 0, sender.Size.Width, sender.Size.Height);
 
-            var status = _liveStatesService.LiveStates.LyricsWindowStatus;
-            var albumArtLayout = status.AlbumArtLayoutSettings;
-            var lyricsBg = status.LyricsBackgroundSettings;
-            var lyricsStyle = status.LyricsStyleSettings;
-            var lyricsEffect = status.LyricsEffectSettings;
+            var albumArtLayout = _lyricsWindowStatus.AlbumArtLayoutSettings;
+            var lyricsBg = _lyricsWindowStatus.LyricsBackgroundSettings;
+            var lyricsStyle = _lyricsWindowStatus.LyricsStyleSettings;
+            var lyricsEffect = _lyricsWindowStatus.LyricsEffectSettings;
 
             double songDuration = _mediaSessionsService.CurrentSongInfo?.DurationMs ?? 0;
             bool isForceWordByWord = _settingsService.AppSettings.GeneralSettings.IsForceWordByWordEffect;
 
-            double fixedSongPositionMs = _songPosition.TotalMilliseconds + (_mediaSessionsService.CurrentMediaSourceProviderInfo?.PositionOffset ?? 0);
-
-            var lyricsThemeColors = _mediaSessionsService.AlbumArtThemeColors;
-
             Color overlayColor;
             double finalOpacity;
 
-            if (status.IsAdaptToEnvironment)
+            if (_lyricsWindowStatus.IsAdaptToEnvironment)
             {
                 // <20><><EFBFBD><EFBFBD>Ӧɫ
                 overlayColor = _immersiveBgColorTransition.Value;
@@ -345,7 +368,7 @@ namespace BetterLyrics.WinUI3.Controls
                 lyricsBg.IsPureColorOverlayEnabled
             );
 
-            _fluidRenderer.Opacity = lyricsBg.FluidOverlayOpacity;
+            _fluidRenderer.Opacity = lyricsBg.FluidOverlayOpacity / 100.0;
             _fluidRenderer.IsEnabled = lyricsBg.IsFluidOverlayEnabled;
             _fluidRenderer.Draw(sender, args.DrawingSession);
 
@@ -356,7 +379,7 @@ namespace BetterLyrics.WinUI3.Controls
             _lyricsRenderer.Draw(
                 control: sender,
                 ds: args.DrawingSession,
-                lyricsData: _lyricsData,
+                lines: _renderLyricsLines,
                 playingLineIndex: _playingLineIndex,
                 mouseHoverLineIndex: _mouseHoverLineIndex,
                 isMousePressing: _isMousePressing,
@@ -368,21 +391,22 @@ namespace BetterLyrics.WinUI3.Controls
                 lyricsHeight: _renderLyricsHeight,
                 userScrollOffset: _mouseYScrollTransition.Value,
                 lyricsOpacity: _renderLyricsOpacity,
-                windowStatus: status,
-                strokeColor: lyricsThemeColors.StrokeFontColor,
-                bgColor: lyricsThemeColors.BgFontColor,
-                fgColor: lyricsThemeColors.FgFontColor,
+                playingLineTopOffsetFactor: lyricsStyle.PlayingLineTopOffset / 100.0,
+                windowStatus: _lyricsWindowStatus,
+                strokeColor: _albumArtThemeColors.StrokeFontColor,
+                bgColor: _albumArtThemeColors.BgFontColor,
+                fgColor: _albumArtThemeColors.FgFontColor,
                 getPlaybackState: (lineIndex) =>
                 {
-                    if (_lyricsData == null) return new LinePlaybackState();
+                    if (_renderLyricsLines == null) return new LinePlaybackState();
 
-                    var line = _lyricsData.LyricsLines.ElementAtOrDefault(lineIndex);
+                    var line = _renderLyricsLines.ElementAtOrDefault(lineIndex);
                     if (line == null) return new LinePlaybackState();
 
-                    var nextLine = _lyricsData.LyricsLines.ElementAtOrDefault(lineIndex + 1);
+                    var nextLine = _renderLyricsLines.ElementAtOrDefault(lineIndex + 1);
 
                     return _synchronizer.GetLinePlayingProgress(
-                        fixedSongPositionMs,
+                        _songPositionWithOffset.TotalMilliseconds,
                         line,
                         nextLine,
                         songDuration,
@@ -403,32 +427,35 @@ namespace BetterLyrics.WinUI3.Controls
                     style: lyricsBg.SpectrumStyle,
                     canvasWidth: sender.Size.Width,
                     canvasHeight: sender.Size.Height,
-                    fillColor: lyricsThemeColors.BgFontColor
+                    fillColor: _albumArtThemeColors.BgFontColor
                 );
             }
 
 #if DEBUG
-            args.DrawingSession.DrawText(
-                    $"Lyrics render start pos: ({(int)_renderLyricsStartX}, {(int)_renderLyricsStartY})\n" +
-                    $"Lyrics render size: [{(int)_renderLyricsWidth} x {(int)_renderLyricsHeight}]\n" +
-                    $"Lyrics actual height: {_layoutManager.CalculateActualHeight(_lyricsData?.LyricsLines)}\n" +
-                    $"Playing line (idx): {_playingLineIndex}\n" +
-                    $"Mouse hovering line (idx): {_mouseHoverLineIndex}\n" +
-                    $"Visible lines range (idx): [{_visibleRange.Start}, {_visibleRange.End}]\n" +
-                    $"Total line count: {_layoutManager.CalculateMaxRange(_lyricsData?.LyricsLines).End + 1}\n" +
-                    $"Played: {TimeSpan.FromMilliseconds(fixedSongPositionMs)} / {TimeSpan.FromMilliseconds(_mediaSessionsService.CurrentSongInfo?.DurationMs ?? 0)}\n" +
-                    $"Y offset: {_canvasYScrollTransition.Value}\n" +
-                    $"User scroll offset: {_mouseYScrollTransition.Value}",
-                new Vector2(0, 0), Colors.Red);
+            //args.DrawingSession.DrawText(
+            //        $"Lyrics render start pos: ({(int)_renderLyricsStartX}, {(int)_renderLyricsStartY})\n" +
+            //        $"Lyrics render size: [{(int)_renderLyricsWidth} x {(int)_renderLyricsHeight}]\n" +
+            //        $"Lyrics actual height: {LyricsLayoutManager.CalculateActualHeight(_renderLyricsLines)}\n" +
+            //        $"Playing line (idx): {_playingLineIndex}\n" +
+            //        $"Mouse hovering line (idx): {_mouseHoverLineIndex}\n" +
+            //        $"Visible lines range (idx): [{_visibleRange.Start}, {_visibleRange.End}]\n" +
+            //        $"Total line count: {LyricsLayoutManager.CalculateMaxRange(_renderLyricsLines).End + 1}\n" +
+            //        $"Played: {_songPosition} / {TimeSpan.FromMilliseconds(_mediaSessionsService.CurrentSongInfo?.DurationMs ?? 0)}\n" +
+            //        $"Y offset: {_canvasYScrollTransition.Value}\n" +
+            //        $"User scroll offset: {_mouseYScrollTransition.Value}",
+            //    new Vector2(0, 0), Colors.Red);
 #endif
 
         }
 
         private void Canvas_Update(ICanvasAnimatedControl sender, CanvasAnimatedUpdateEventArgs args)
         {
-            var lyricsBg = _liveStatesService.LiveStates.LyricsWindowStatus.LyricsBackgroundSettings;
-            var lyricsEffect = _liveStatesService.LiveStates.LyricsWindowStatus.LyricsEffectSettings;
-            var albumArtThemeColors = _mediaSessionsService.AlbumArtThemeColors;
+            if (_lyricsWindowStatus == null) return;
+
+            var lyricsBg = _lyricsWindowStatus.LyricsBackgroundSettings;
+            var lyricsStyle = _lyricsWindowStatus.LyricsStyleSettings;
+            var lyricsEffect = _lyricsWindowStatus.LyricsEffectSettings;
+            var lyricsData = _mediaSessionsService.CurrentLyricsData;
 
             TimeSpan elapsedTime = args.Timing.ElapsedTime;
 
@@ -446,7 +473,7 @@ namespace BetterLyrics.WinUI3.Controls
 
             #region UpdatePlayingLineIndex
 
-            int newPlayingIndex = _synchronizer.GetCurrentLineIndex(_songPosition.TotalMilliseconds, _lyricsData);
+            int newPlayingIndex = _synchronizer.GetCurrentLineIndex(_songPositionWithOffset.TotalMilliseconds, lyricsData);
             bool isPlayingLineChanged = newPlayingIndex != _playingLineIndex;
             _playingLineIndex = newPlayingIndex;
 
@@ -456,7 +483,7 @@ namespace BetterLyrics.WinUI3.Controls
 
             if (isPlayingLineChanged || _isLayoutChanged)
             {
-                var targetScroll = _layoutManager.CalculateTargetScrollOffset(_lyricsData, _playingLineIndex);
+                var targetScroll = LyricsLayoutManager.CalculateTargetScrollOffset(_renderLyricsLines, _playingLineIndex);
                 if (targetScroll.HasValue) _canvasTargetScrollOffset = targetScroll.Value;
 
                 _canvasYScrollTransition.SetEasingType(lyricsEffect.LyricsScrollEasingType);
@@ -469,36 +496,40 @@ namespace BetterLyrics.WinUI3.Controls
 
             _mouseYScrollTransition.Update(elapsedTime);
 
-            _mouseHoverLineIndex = _layoutManager.FindMouseHoverLineIndex(
-                _lyricsData?.LyricsLines, 
+            _mouseHoverLineIndex = LyricsLayoutManager.FindMouseHoverLineIndex(
+                _renderLyricsLines,
                 _isMouseInLyricsArea,
-                _mousePosition, 
-                _canvasYScrollTransition.Value + _mouseYScrollTransition.Value, 
-                _renderLyricsStartY, 
-                _renderLyricsHeight
+                _mousePosition,
+                _canvasYScrollTransition.Value + _mouseYScrollTransition.Value,
+                _renderLyricsStartY,
+                _renderLyricsHeight,
+                lyricsStyle.PlayingLineTopOffset / 100.0
             );
 
-            _visibleRange = _layoutManager.CalculateVisibleRange(
-                _lyricsData?.LyricsLines,
+            _visibleRange = LyricsLayoutManager.CalculateVisibleRange(
+                _renderLyricsLines,
                 _canvasYScrollTransition.Value + _mouseYScrollTransition.Value, // <20><>ǰ<EFBFBD><C7B0><EFBFBD><EFBFBD>λ<EFBFBD><CEBB>
                 _renderLyricsStartY,
                 _renderLyricsHeight,
-                sender.Size.Height
+                sender.Size.Height,
+                lyricsStyle.PlayingLineTopOffset / 100.0
             );
 
-            var maxRange = _layoutManager.CalculateMaxRange(_lyricsData?.LyricsLines);
+            var maxRange = LyricsLayoutManager.CalculateMaxRange(_renderLyricsLines);
 
             _animator.UpdateLines(
-                _lyricsData,
+                _renderLyricsLines,
                 _isMouseScrolling ? maxRange.Start : _visibleRange.Start,
                 _isMouseScrolling ? maxRange.End : _visibleRange.End,
                 _playingLineIndex,
                 sender.Size.Height,
                 _canvasTargetScrollOffset,
-                _liveStatesService.LiveStates.LyricsWindowStatus.LyricsEffectSettings,
+                lyricsStyle.PlayingLineTopOffset / 100.0,
+                _lyricsWindowStatus.LyricsStyleSettings,
+                _lyricsWindowStatus.LyricsEffectSettings,
                 _canvasYScrollTransition,
-                albumArtThemeColors.BgFontColor,
-                albumArtThemeColors.FgFontColor,
+                _albumArtThemeColors.BgFontColor,
+                _albumArtThemeColors.FgFontColor,
                 elapsedTime,
                 _isMouseScrolling,
                 _isLayoutChanged,
@@ -554,14 +585,17 @@ namespace BetterLyrics.WinUI3.Controls
 
         private void Canvas_Unloaded(object sender, RoutedEventArgs e)
         {
-            Canvas.RemoveFromVisualTree();
-            Canvas = null;
-
             _fluidRenderer.Dispose();
             _snowRenderer.Dispose();
             _fogRenderer.Dispose();
             _spectrumRenderer.Dispose();
+
+            _renderLyricsLines = null;
+
             DisposeAnalyzer();
+
+            Canvas.RemoveFromVisualTree();
+            Canvas = null;
         }
 
         private async void Canvas_CreateResources(CanvasAnimatedControl sender, Microsoft.Graphics.Canvas.UI.CanvasCreateResourcesEventArgs args)
@@ -587,12 +621,12 @@ namespace BetterLyrics.WinUI3.Controls
 
         private void TriggerRelayout()
         {
-            if (_layoutManager == null || _lyricsData == null || !_isLayoutChanged) return;
+            if (_renderLyricsLines == null || !_isLayoutChanged || _lyricsWindowStatus == null) return;
 
-            _layoutManager.MeasureAndArrange(
+            LyricsLayoutManager.MeasureAndArrange(
                 resourceCreator: Canvas,
-                lyricsData: _lyricsData,
-                status: _liveStatesService.LiveStates.LyricsWindowStatus,
+                lines: _renderLyricsLines,
+                status: _lyricsWindowStatus,
                 appSettings: _settingsService.AppSettings,
                 canvasWidth: Canvas.Size.Width,
                 canvasHeight: Canvas.Size.Height,
@@ -607,6 +641,7 @@ namespace BetterLyrics.WinUI3.Controls
             {
                 _songPosition += elapsedTime;
                 _totalPlayedTime += elapsedTime;
+                _songPositionWithOffset = _songPosition + TimeSpan.FromMilliseconds(_mediaSessionsService.CurrentMediaSourceProviderInfo?.PositionOffset ?? 0);
                 CheckAndScrobbleLastFM();
             }
         }
@@ -628,27 +663,23 @@ namespace BetterLyrics.WinUI3.Controls
 
         private void ResetPlaybackState()
         {
-            _totalPlayedTime = TimeSpan.Zero;
+            _songPosition = TimeSpan.Zero;
             _totalPlayedTime = TimeSpan.Zero;
             _isLastFMTracked = false;
         }
 
-        public void Receive(PropertyChangedMessage<AlbumArtThemeColors> message)
+        private void UpdateRenderLyricsLines()
         {
-            if (message.Sender is IMediaSessionsService)
+            _renderLyricsLines = null;
+            _renderLyricsLines = _mediaSessionsService.CurrentLyricsData?.LyricsLines.Select(x => new RenderLyricsLine()
             {
-                if (message.PropertyName == nameof(IMediaSessionsService.AlbumArtThemeColors))
-                {
-                    var lyricsThemeColors = message.NewValue;
-                    _immersiveBgColorTransition.StartTransition(lyricsThemeColors.EnvColor);
-                    _accentColor1Transition.StartTransition(lyricsThemeColors.AccentColor1);
-                    _accentColor2Transition.StartTransition(lyricsThemeColors.AccentColor2);
-                    _accentColor3Transition.StartTransition(lyricsThemeColors.AccentColor3);
-                    _accentColor4Transition.StartTransition(lyricsThemeColors.AccentColor4);
-
-                    _isLayoutChanged = true;
-                }
-            }
+                LyricsSyllables = x.LyricsSyllables,
+                StartMs = x.StartMs,
+                EndMs = x.EndMs,
+                PhoneticText = x.PhoneticText,
+                OriginalText = x.OriginalText,
+                TranslatedText = x.TranslatedText
+            }).ToList();
         }
 
         public void Receive(PropertyChangedMessage<TimeSpan> message)
@@ -690,26 +721,26 @@ namespace BetterLyrics.WinUI3.Controls
             {
                 if (message.PropertyName == nameof(IMediaSessionsService.CurrentLyricsData))
                 {
-                    _lyricsData = message.NewValue;
+                    UpdateRenderLyricsLines();
                     _isLayoutChanged = true;
                 }
             }
         }
 
-        public void Receive(PropertyChangedMessage<LyricsWindowStatus> message)
+        public void Receive(PropertyChangedMessage<SongInfo?> message)
         {
-            if (message.Sender is LiveStates)
+            if (message.Sender is IMediaSessionsService)
             {
-                if (message.PropertyName == nameof(LiveStates.LyricsWindowStatus))
+                if (message.PropertyName == nameof(IMediaSessionsService.CurrentSongInfo))
                 {
-                    _isLayoutChanged = true;
+                    ResetPlaybackState();
                 }
             }
         }
 
         public void Receive(PropertyChangedMessage<int> message)
         {
-            if (message.Sender is LyricsStyleSettings)
+            if (message.Sender == LyricsWindowStatus?.LyricsStyleSettings)
             {
                 if (message.PropertyName == nameof(LyricsStyleSettings.PhoneticLyricsFontSize))
                 {
@@ -727,8 +758,24 @@ namespace BetterLyrics.WinUI3.Controls
                 {
                     _isLayoutChanged = true;
                 }
+                else if (message.PropertyName == nameof(LyricsStyleSettings.PlayingLineTopOffset))
+                {
+                    _isLayoutChanged = true;
+                }
+                else if (message.PropertyName == nameof(LyricsStyleSettings.PhoneticLyricsOpacity))
+                {
+                    _isLayoutChanged = true;
+                }
+                else if (message.PropertyName == nameof(LyricsStyleSettings.OriginalLyricsOpacity))
+                {
+                    _isLayoutChanged = true;
+                }
+                else if (message.PropertyName == nameof(LyricsStyleSettings.TranslatedLyricsOpacity))
+                {
+                    _isLayoutChanged = true;
+                }
             }
-            else if (message.Sender is LyricsEffectSettings)
+            else if (message.Sender == LyricsWindowStatus?.LyricsEffectSettings)
             {
                 if (message.PropertyName == nameof(LyricsEffectSettings.LyricsScrollDuration))
                 {
@@ -759,7 +806,7 @@ namespace BetterLyrics.WinUI3.Controls
 
         public void Receive(PropertyChangedMessage<double> message)
         {
-            if (message.Sender is LyricsStyleSettings)
+            if (message.Sender == LyricsWindowStatus?.LyricsStyleSettings)
             {
                 if (message.PropertyName == nameof(LyricsStyleSettings.LyricsLineSpacingFactor))
                 {
@@ -770,14 +817,18 @@ namespace BetterLyrics.WinUI3.Controls
 
         public void Receive(PropertyChangedMessage<bool> message)
         {
-            if (message.Sender is LyricsEffectSettings)
+            if (message.Sender == LyricsWindowStatus?.LyricsEffectSettings)
             {
                 if (message.PropertyName == nameof(LyricsEffectSettings.IsFanLyricsEnabled))
                 {
                     _isLayoutChanged = true;
                 }
+                else if (message.PropertyName == nameof(LyricsEffectSettings.IsLyricsBlurEffectEnabled))
+                {
+                    _isLayoutChanged = true;
+                }
             }
-            else if (message.Sender is LyricsStyleSettings)
+            else if (message.Sender == LyricsWindowStatus?.LyricsStyleSettings)
             {
                 if (message.PropertyName == nameof(LyricsStyleSettings.IsDynamicLyricsFontSize))
                 {
@@ -788,7 +839,7 @@ namespace BetterLyrics.WinUI3.Controls
 
         public void Receive(PropertyChangedMessage<TextAlignmentType> message)
         {
-            if (message.Sender is LyricsStyleSettings)
+            if (message.Sender == LyricsWindowStatus?.LyricsStyleSettings)
             {
                 if (message.PropertyName == nameof(LyricsStyleSettings.LyricsAlignmentType))
                 {
@@ -797,20 +848,9 @@ namespace BetterLyrics.WinUI3.Controls
             }
         }
 
-        public void Receive(PropertyChangedMessage<SongInfo?> message)
-        {
-            if (message.Sender is IMediaSessionsService)
-            {
-                if (message.PropertyName == nameof(IMediaSessionsService.CurrentSongInfo))
-                {
-                    ResetPlaybackState();
-                }
-            }
-        }
-
         public void Receive(PropertyChangedMessage<LyricsFontWeight> message)
         {
-            if (message.Sender is LyricsStyleSettings)
+            if (message.Sender == LyricsWindowStatus?.LyricsStyleSettings)
             {
                 if (message.PropertyName == nameof(LyricsStyleSettings.LyricsFontWeight))
                 {
@@ -821,7 +861,7 @@ namespace BetterLyrics.WinUI3.Controls
 
         public void Receive(PropertyChangedMessage<string> message)
         {
-            if (message.Sender is LyricsStyleSettings)
+            if (message.Sender == LyricsWindowStatus?.LyricsStyleSettings)
             {
                 if (message.PropertyName == nameof(LyricsStyleSettings.LyricsCJKFontFamily))
                 {
@@ -833,5 +873,6 @@ namespace BetterLyrics.WinUI3.Controls
                 }
             }
         }
+
     }
 }

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Controls/LyricsEffectSettingsControl.xaml

@@ -23,20 +23,83 @@
                         Style="{StaticResource SettingsSectionHeaderTextBlockStyle}"
                         Text="Effect" />
 
-                    <!--  辉光效果  -->
-                    <dev:SettingsCard x:Uid="SettingsPageLyricsGlowEffect" HeaderIcon="{ui:FontIcon FontFamily={StaticResource IconFontFamily}, Glyph=&#xE9A9;}">
-                        <ToggleSwitch IsOn="{x:Bind LyricsEffectSettings.IsLyricsGlowEffectEnabled, Mode=TwoWay}" />
+                    <!--  模糊效果  -->
+                    <dev:SettingsCard x:Uid="SettingsPageLyricsBlurEffect" HeaderIcon="{ui:FontIcon FontFamily={StaticResource IconFontFamily}, Glyph=&#xE727;}">
+                        <ToggleSwitch IsOn="{x:Bind LyricsEffectSettings.IsLyricsBlurEffectEnabled, Mode=TwoWay}" />
                     </dev:SettingsCard>
 
+                    <!--  辉光效果  -->
+                    <dev:SettingsExpander x:Uid="SettingsPageLyricsGlowEffect" HeaderIcon="{ui:FontIcon FontFamily={StaticResource IconFontFamily}, Glyph=&#xE9A9;}">
+                        <ToggleSwitch IsOn="{x:Bind LyricsEffectSettings.IsLyricsGlowEffectEnabled, Mode=TwoWay}" />
+                        <dev:SettingsExpander.Items>
+                            <dev:SettingsCard x:Uid="SettingsPageScope">
+                                <ComboBox SelectedIndex="{x:Bind LyricsEffectSettings.LyricsGlowEffectScope, Mode=TwoWay, Converter={StaticResource EnumToIntConverter}}">
+                                    <ComboBoxItem x:Uid="SettingsPageEffectScopeLongDurationSyllable" />
+                                    <ComboBoxItem x:Uid="SettingsPageEffectLineStartToCurrentChar" />
+                                </ComboBox>
+                            </dev:SettingsCard>
+                            <dev:SettingsCard x:Uid="SettingsPageLongSyllableDuration">
+                                <local:ExtendedSlider
+                                    Default="700"
+                                    Maximum="1000"
+                                    Minimum="0"
+                                    Unit="ms"
+                                    Value="{x:Bind LyricsEffectSettings.LyricsGlowEffectLongSyllableDuration, Mode=TwoWay}" />
+                            </dev:SettingsCard>
+                            <dev:SettingsCard x:Uid="SettingsPageAutoAdjust">
+                                <ToggleSwitch IsOn="{x:Bind LyricsEffectSettings.IsLyricsGlowEffectAmountAutoAdjust, Mode=TwoWay}" />
+                            </dev:SettingsCard>
+                            <dev:SettingsCard x:Uid="SettingsPageAmount" IsEnabled="{x:Bind LyricsEffectSettings.IsLyricsGlowEffectAmountAutoAdjust, Converter={StaticResource BoolNegationConverter}, Mode=OneWay}">
+                                <local:ExtendedSlider
+                                    Maximum="16"
+                                    Minimum="0"
+                                    Value="{x:Bind LyricsEffectSettings.LyricsGlowEffectAmount, Mode=TwoWay}" />
+                            </dev:SettingsCard>
+                        </dev:SettingsExpander.Items>
+                    </dev:SettingsExpander>
+
                     <!--  缩放效果  -->
-                    <dev:SettingsCard x:Uid="SettingsPageLyricsScaleEffect" HeaderIcon="{ui:FontIcon FontFamily={StaticResource IconFontFamily}, Glyph=&#xE8A3;}">
+                    <dev:SettingsExpander x:Uid="SettingsPageLyricsScaleEffect" HeaderIcon="{ui:FontIcon FontFamily={StaticResource IconFontFamily}, Glyph=&#xE8A3;}">
                         <ToggleSwitch IsOn="{x:Bind LyricsEffectSettings.IsLyricsScaleEffectEnabled, Mode=TwoWay}" />
-                    </dev:SettingsCard>
+                        <dev:SettingsExpander.Items>
+                            <dev:SettingsCard x:Uid="SettingsPageLongSyllableDuration">
+                                <local:ExtendedSlider
+                                    Default="700"
+                                    Maximum="1000"
+                                    Minimum="0"
+                                    Unit="ms"
+                                    Value="{x:Bind LyricsEffectSettings.LyricsScaleEffectLongSyllableDuration, Mode=TwoWay}" />
+                            </dev:SettingsCard>
+                            <dev:SettingsCard x:Uid="SettingsPageAutoAdjust">
+                                <ToggleSwitch IsOn="{x:Bind LyricsEffectSettings.IsLyricsScaleEffectAmountAutoAdjust, Mode=TwoWay}" />
+                            </dev:SettingsCard>
+                            <dev:SettingsCard x:Uid="SettingsPageAmount" IsEnabled="{x:Bind LyricsEffectSettings.IsLyricsScaleEffectAmountAutoAdjust, Converter={StaticResource BoolNegationConverter}, Mode=OneWay}">
+                                <local:ExtendedSlider
+                                    Default="115"
+                                    Maximum="200"
+                                    Minimum="100"
+                                    Unit="%"
+                                    Value="{x:Bind LyricsEffectSettings.LyricsScaleEffectAmount, Mode=TwoWay}" />
+                            </dev:SettingsCard>
+                        </dev:SettingsExpander.Items>
+                    </dev:SettingsExpander>
 
                     <!--  浮动动画  -->
-                    <dev:SettingsCard x:Uid="SettingsPageLyricsFloatAnimation" HeaderIcon="{ui:FontIcon FontFamily={StaticResource IconFontFamily}, Glyph=&#xE8C5;}">
+                    <dev:SettingsExpander x:Uid="SettingsPageLyricsFloatAnimation" HeaderIcon="{ui:FontIcon FontFamily={StaticResource IconFontFamily}, Glyph=&#xE8C5;}">
                         <ToggleSwitch IsOn="{x:Bind LyricsEffectSettings.IsLyricsFloatAnimationEnabled, Mode=TwoWay}" />
-                    </dev:SettingsCard>
+                        <dev:SettingsExpander.Items>
+                            <dev:SettingsCard x:Uid="SettingsPageAutoAdjust">
+                                <ToggleSwitch IsOn="{x:Bind LyricsEffectSettings.IsLyricsFloatAnimationAmountAutoAdjust, Mode=TwoWay}" />
+                            </dev:SettingsCard>
+                            <dev:SettingsCard x:Uid="SettingsPageAmount" IsEnabled="{x:Bind LyricsEffectSettings.IsLyricsFloatAnimationAmountAutoAdjust, Converter={StaticResource BoolNegationConverter}, Mode=OneWay}">
+                                <local:ExtendedSlider
+                                    Default="4"
+                                    Maximum="16"
+                                    Minimum="0"
+                                    Value="{x:Bind LyricsEffectSettings.LyricsFloatAnimationAmount, Mode=TwoWay}" />
+                            </dev:SettingsCard>
+                        </dev:SettingsExpander.Items>
+                    </dev:SettingsExpander>
 
                     <!--  扇形歌词  -->
                     <dev:SettingsExpander

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Controls/LyricsSearchControl.xaml

@@ -105,14 +105,6 @@
                                         <Run Text="*" />
                                         <Run x:Uid="ArtistsSplitHint" />
                                     </Paragraph>
-                                </RichTextBlock>
-
-                                <RichTextBlock
-                                    FontSize="12"
-                                    FontWeight="Bold"
-                                    Foreground="{ThemeResource TextFillColorSecondaryBrush}"
-                                    Loaded="ArtistsSplitHintRichTextBlock_Loaded"
-                                    TextWrapping="Wrap">
                                     <Paragraph>
                                         <Run Text=";    ,    /    ；    、    ，" />
                                     </Paragraph>
@@ -168,6 +160,10 @@
                                 Style="{StaticResource AccentButtonStyle}" />
                         </dev:SettingsCard>
 
+                        <dev:SettingsCard x:Uid="LyricsSearchControlIgnoreCache">
+                            <ToggleSwitch IsOn="{x:Bind ViewModel.AppSettings.GeneralSettings.IgnoreCacheWhenSearching, Mode=TwoWay}" />
+                        </dev:SettingsCard>
+
                     </StackPanel>
                 </ScrollViewer>
             </Grid>

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Controls/LyricsSearchControl.xaml.cs

@@ -2,8 +2,6 @@ using BetterLyrics.WinUI3.Models;
 using BetterLyrics.WinUI3.ViewModels;
 using CommunityToolkit.Mvvm.DependencyInjection;
 using Microsoft.UI.Xaml.Controls;
-using Microsoft.UI.Xaml.Documents;
-using Microsoft.UI.Xaml.Media;
 
 // To learn more about WinUI, the WinUI project structure,
 // and more about our project templates, see: http://aka.ms/winui-project-info.
@@ -25,25 +23,5 @@ namespace BetterLyrics.WinUI3.Controls
             ViewModel.SelectedLyricsLine = e.OriginalSource as LyricsLine;
         }
 
-        private void ArtistsSplitHintRichTextBlock_Loaded(object sender, Microsoft.UI.Xaml.RoutedEventArgs e)
-        {
-            if (sender is RichTextBlock richTextBlock)
-            {
-                TextHighlighter highlighter = new()
-                {
-                    Background = App.Current.Resources["AccentTextFillColorPrimaryBrush"] as SolidColorBrush,
-                    Ranges =
-                    {
-                        new() { StartIndex = 0, Length = 1 },
-                        new() { StartIndex = 5, Length = 1 },
-                        new() { StartIndex = 10, Length = 1 },
-                        new() { StartIndex = 15, Length = 1 },
-                        new() { StartIndex = 20, Length = 1 },
-                        new() { StartIndex = 25, Length = 1 },
-                    }
-                };
-                richTextBlock.TextHighlighters.Add(highlighter);
-            }
-        }
     }
 }

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Controls/LyricsStyleSettingsControl.xaml

@@ -29,6 +29,26 @@
                         </ComboBox>
                     </dev:SettingsCard>
 
+                    <dev:SettingsCard x:Uid="SettingsPageLyricsCenterTopOffset" HeaderIcon="{ui:FontIcon FontFamily={StaticResource IconFontFamily}, Glyph=&#xE78A;}">
+                        <local:ExtendedSlider
+                            Default="50"
+                            Maximum="100"
+                            Minimum="0"
+                            Unit="%"
+                            Value="{x:Bind LyricsStyleSettings.PlayingLineTopOffset, Mode=TwoWay}" />
+                    </dev:SettingsCard>
+
+                    <dev:SettingsCard x:Uid="SettingsPageLyricsLineSpacingFactor" HeaderIcon="{ui:FontIcon FontFamily={StaticResource IconFontFamily}, Glyph=&#xF579;}">
+                        <local:ExtendedSlider
+                            x:Uid="SettingsPageLyricsLineSpacingFactorSlider"
+                            Default="0.5"
+                            Frequency="0.1"
+                            Maximum="2"
+                            Minimum="0"
+                            Unit="x"
+                            Value="{x:Bind LyricsStyleSettings.LyricsLineSpacingFactor, Mode=TwoWay}" />
+                    </dev:SettingsCard>
+
                     <dev:SettingsExpander x:Uid="SettingsPageLyricsFontFamily" HeaderIcon="{ui:FontIcon FontFamily={StaticResource IconFontFamily}, Glyph=&#xE8D2;}">
                         <dev:SettingsExpander.Items>
                             <dev:SettingsCard x:Uid="SettingsPageCJK">
@@ -207,16 +227,35 @@
                         </dev:SettingsExpander.Items>
                     </dev:SettingsExpander>
 
-                    <dev:SettingsCard x:Uid="SettingsPageLyricsLineSpacingFactor" HeaderIcon="{ui:FontIcon FontFamily={StaticResource IconFontFamily}, Glyph=&#xF579;}">
-                        <local:ExtendedSlider
-                            x:Uid="SettingsPageLyricsLineSpacingFactorSlider"
-                            Default="0.5"
-                            Frequency="0.1"
-                            Maximum="2"
-                            Minimum="0"
-                            Unit="x"
-                            Value="{x:Bind LyricsStyleSettings.LyricsLineSpacingFactor, Mode=TwoWay}" />
-                    </dev:SettingsCard>
+                    <!--  字体不透明度  -->
+                    <dev:SettingsExpander x:Uid="SettingsPageLyricsOpacity" HeaderIcon="{ui:FontIcon FontFamily={StaticResource IconFontFamily}, Glyph=&#xEF20;}">
+                        <dev:SettingsExpander.Items>
+                            <dev:SettingsCard x:Uid="SettingsPagePhoneticText">
+                                <local:ExtendedSlider
+                                    Default="60"
+                                    Frequency="1"
+                                    Maximum="100"
+                                    Minimum="0"
+                                    Value="{x:Bind LyricsStyleSettings.PhoneticLyricsOpacity, Mode=TwoWay}" />
+                            </dev:SettingsCard>
+                            <dev:SettingsCard x:Uid="SettingsPageOriginalText">
+                                <local:ExtendedSlider
+                                    Default="30"
+                                    Frequency="1"
+                                    Maximum="100"
+                                    Minimum="0"
+                                    Value="{x:Bind LyricsStyleSettings.OriginalLyricsOpacity, Mode=TwoWay}" />
+                            </dev:SettingsCard>
+                            <dev:SettingsCard x:Uid="SettingsPageTranslatedText">
+                                <local:ExtendedSlider
+                                    Default="60"
+                                    Frequency="1"
+                                    Maximum="100"
+                                    Minimum="0"
+                                    Value="{x:Bind LyricsStyleSettings.TranslatedLyricsOpacity, Mode=TwoWay}" />
+                            </dev:SettingsCard>
+                        </dev:SettingsExpander.Items>
+                    </dev:SettingsExpander>
 
                 </StackPanel>
             </Grid>

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Controls/LyricsWindowSettingsControl.xaml

@@ -21,24 +21,7 @@
 
                     <StackPanel Spacing="{StaticResource SettingsCardSpacing}">
 
-                        <Grid>
-                            <Grid.ColumnDefinitions>
-                                <ColumnDefinition Width="Auto" />
-                                <ColumnDefinition Width="*" />
-                                <ColumnDefinition Width="Auto" />
-                            </Grid.ColumnDefinitions>
-                            <TextBlock
-                                x:Uid="SettingsPageRecordedWindowStatus"
-                                Grid.Column="0"
-                                Style="{StaticResource SettingsSectionHeaderTextBlockStyle}" />
-                            <Button
-                                Grid.Column="2"
-                                Margin="0,30,0,0"
-                                Command="{x:Bind ViewModel.OpenConfigPanelCommand}"
-                                Style="{StaticResource AccentButtonStyle}">
-                                <TextBlock x:Uid="LyricsWindowSettingsControlCurrentLyricsWindowConfig" />
-                            </Button>
-                        </Grid>
+                        <TextBlock x:Uid="SettingsPageRecordedWindowStatus" Style="{StaticResource SettingsSectionHeaderTextBlockStyle}" />
 
                         <StackPanel Orientation="Horizontal" Spacing="3">
 
@@ -87,7 +70,7 @@
                                 Padding="0,12"
                                 CornerRadius="4"
                                 ItemsSource="{x:Bind ViewModel.AppSettings.WindowBoundsRecords, Mode=OneWay}"
-                                SelectedItem="{x:Bind ViewModel.LiveStates.LyricsWindowStatus, Mode=TwoWay}">
+                                SelectionMode="None">
                                 <ItemsControl.ItemsPanel>
                                     <ItemsPanelTemplate>
                                         <controls:WrapPanel HorizontalSpacing="0" VerticalSpacing="0" />
@@ -101,10 +84,6 @@
                                             Spacing="6">
                                             <StackPanel.ContextFlyout>
                                                 <MenuBarItemFlyout>
-                                                    <MenuFlyoutItem
-                                                        x:Uid="LyricsWindowSettingsControlSetDefault"
-                                                        Click="SetDefaultMenuFlyoutItem_Click"
-                                                        IsEnabled="{Binding IsDefault, Mode=OneWay, Converter={StaticResource BoolNegationConverter}}" />
                                                     <MenuFlyoutItem x:Uid="SettingsPageCreateFromCurrent" Click="CopyMenuFlyoutItem_Click" />
                                                     <MenuFlyoutItem x:Uid="LyricsWindowSettingsControlShare" Click="ShareMenuFlyoutItem_Click" />
                                                     <MenuFlyoutItem
@@ -113,13 +92,61 @@
                                                         IsEnabled="{Binding IsDefault, Mode=OneWay, Converter={StaticResource BoolNegationConverter}}" />
                                                 </MenuBarItemFlyout>
                                             </StackPanel.ContextFlyout>
-                                            <uc:DemoWindowGrid LyricsWindowStatus="{Binding}" />
+                                            <Grid>
+                                                <Border
+                                                    BorderBrush="{ThemeResource AccentAAFillColorDefaultBrush}"
+                                                    BorderThickness="4"
+                                                    CornerRadius="4"
+                                                    Visibility="{Binding IsOpened, Mode=OneWay, Converter={StaticResource BoolToVisibilityConverter}}" />
+                                                <uc:DemoWindowGrid
+                                                    Margin="4"
+                                                    LyricsWindowStatus="{Binding}"
+                                                    Tapped="DemoWindowGrid_Tapped" />
+                                            </Grid>
+                                            <Grid>
+                                                <ToggleButton
+                                                    Grid.Column="0"
+                                                    HorizontalAlignment="Stretch"
+                                                    Click="SetDefaultMenuFlyoutItem_Click"
+                                                    IsChecked="{Binding IsDefault, Mode=OneWay}">
+                                                    <TextBlock x:Uid="LyricsWindowSettingsControlSetDefault" />
+                                                </ToggleButton>
+                                            </Grid>
+                                            <Grid ColumnSpacing="4">
+                                                <Grid.ColumnDefinitions>
+                                                    <ColumnDefinition Width="*" />
+                                                    <ColumnDefinition Width="*" />
+                                                </Grid.ColumnDefinitions>
+                                                <Button
+                                                    Grid.Column="0"
+                                                    HorizontalAlignment="Stretch"
+                                                    Click="ConfigButton_Click">
+                                                    <TextBlock x:Uid="LyricsWindowSettingsControlLyricsWindowConfig" />
+                                                </Button>
+                                                <Button
+                                                    Grid.Column="1"
+                                                    HorizontalAlignment="Stretch"
+                                                    Click="CloseStatusButton_Click"
+                                                    IsEnabled="{Binding IsOpened, Mode=OneWay}">
+                                                    <TextBlock x:Uid="SettingsPageCloseStatus" />
+                                                </Button>
+                                            </Grid>
                                         </StackPanel>
                                     </DataTemplate>
                                 </ListView.ItemTemplate>
                             </ListView>
                         </StackPanel>
 
+                        <dev:SettingsCard x:Uid="SettingsPageMultiNowPlayingWindows">
+                            <ToggleSwitch IsOn="{x:Bind ViewModel.AppSettings.GeneralSettings.MultiNowPlayingWindowMode, Mode=TwoWay}" />
+                        </dev:SettingsCard>
+
+                        <dev:SettingsCard x:Uid="SettingsPageMusicGalleryLyrics">
+                            <Button HorizontalAlignment="Stretch" Click="EmbeddedConfigButton_Click">
+                                <TextBlock x:Uid="LyricsWindowSettingsControlLyricsWindowConfig" />
+                            </Button>
+                        </dev:SettingsCard>
+
                     </StackPanel>
 
                 </Grid>
@@ -137,8 +164,15 @@
             <Grid.TranslationTransition>
                 <Vector3Transition />
             </Grid.TranslationTransition>
+            <Grid.RowDefinitions>
+                <RowDefinition Height="Auto" />
+                <RowDefinition Height="*" />
+            </Grid.RowDefinitions>
 
-            <Grid Padding="36,0" Style="{StaticResource SettingsGridStyle}">
+            <Grid
+                Grid.Row="0"
+                Padding="36,0"
+                Style="{StaticResource SettingsGridStyle}">
                 <StackPanel Spacing="{StaticResource SettingsCardSpacing}">
                     <Grid>
                         <Grid.ColumnDefinitions>
@@ -147,9 +181,9 @@
                             <ColumnDefinition Width="Auto" />
                         </Grid.ColumnDefinitions>
                         <TextBlock
-                            x:Uid="LyricsWindowSettingsControlCurrentLyricsWindowConfig"
                             Grid.Column="0"
-                            Style="{StaticResource SettingsSectionHeaderTextBlockStyle}" />
+                            Style="{StaticResource SettingsSectionHeaderTextBlockStyle}"
+                            Text="{x:Bind LyricsWindowStatus.Name, Mode=OneWay}" />
                         <Button
                             Grid.Column="2"
                             Margin="0,30,0,0"
@@ -160,68 +194,31 @@
                             Style="{StaticResource AccentButtonStyle}" />
                     </Grid>
 
-                    <Pivot SelectionChanged="Pivot_SelectionChanged">
+                    <SelectorBar x:Name="ConfigSelectorBar" SelectionChanged="ConfigSelectorBar_SelectionChanged">
 
-                        <PivotItem Tag="General">
-                            <PivotItem.Header>
-                                <TextBlock
-                                    x:Uid="AppSettingsControlGeneral"
-                                    VerticalAlignment="Center"
-                                    Style="{StaticResource BodyTextBlockStyle}" />
-                            </PivotItem.Header>
-                        </PivotItem>
+                        <SelectorBarItem
+                            x:Name="WindowSelectorBarItem"
+                            x:Uid="AppSettingsControlGeneral"
+                            Tag="Window" />
+                        <SelectorBarItem
+                            x:Name="LayoutSelectorBarItem"
+                            x:Uid="SettingsPageLayout"
+                            Tag="Layout" />
+                        <SelectorBarItem
+                            x:Name="AlbumArtStyleSelectorBarItem"
+                            x:Uid="SettingsPageAlbumStyle"
+                            Tag="AlbumArtStyle" />
+                        <SelectorBarItem x:Uid="SettingsPageAlbumEffect" Tag="AlbumArtEffect" />
+                        <SelectorBarItem x:Uid="SettingsPageLyricsStyle" Tag="LyricsStyle" />
+                        <SelectorBarItem x:Uid="SettingsPageLyricsEffect" Tag="LyricsEffect" />
+                        <SelectorBarItem x:Uid="SettingsPageBackgroundOverlay" Tag="LyricsBackground" />
 
-                        <PivotItem Tag="Layout">
-                            <PivotItem.Header>
-                                <TextBlock
-                                    x:Uid="SettingsPageLayout"
-                                    VerticalAlignment="Center"
-                                    Style="{StaticResource BodyTextBlockStyle}" />
-                            </PivotItem.Header>
-                        </PivotItem>
-
-                        <PivotItem Tag="AlbumArtStyle">
-                            <PivotItem.Header>
-                                <TextBlock
-                                    x:Uid="SettingsPageAlbumStyle"
-                                    VerticalAlignment="Center"
-                                    Style="{StaticResource BodyTextBlockStyle}" />
-                            </PivotItem.Header>
-                        </PivotItem>
-
-                        <PivotItem Tag="LyricsStyle">
-                            <PivotItem.Header>
-                                <TextBlock
-                                    x:Uid="SettingsPageLyricsStyle"
-                                    VerticalAlignment="Center"
-                                    Style="{StaticResource BodyTextBlockStyle}" />
-                            </PivotItem.Header>
-                        </PivotItem>
-
-                        <PivotItem Tag="LyricsEffect">
-                            <PivotItem.Header>
-                                <TextBlock
-                                    x:Uid="SettingsPageLyricsEffect"
-                                    VerticalAlignment="Center"
-                                    Style="{StaticResource BodyTextBlockStyle}" />
-                            </PivotItem.Header>
-                        </PivotItem>
-
-                        <PivotItem Tag="LyricsBackground">
-                            <PivotItem.Header>
-                                <TextBlock
-                                    x:Uid="SettingsPageBackgroundOverlay"
-                                    VerticalAlignment="Center"
-                                    Style="{StaticResource BodyTextBlockStyle}" />
-                            </PivotItem.Header>
-                        </PivotItem>
-
-                    </Pivot>
+                    </SelectorBar>
 
                 </StackPanel>
             </Grid>
 
-            <controls:SwitchPresenter Margin="0,110,0,0" Value="{x:Bind ViewModel.ListViewSelectedItemTag, Mode=OneWay}">
+            <controls:SwitchPresenter Grid.Row="1" Value="{x:Bind ViewModel.SelectorBarSelectedItemTag, Mode=OneWay}">
                 <controls:SwitchPresenter.ContentTransitions>
                     <TransitionCollection>
                         <PopupThemeTransition />
@@ -229,155 +226,8 @@
                 </controls:SwitchPresenter.ContentTransitions>
 
                 <!--  Window  -->
-                <controls:Case Value="General">
-                    <ScrollViewer Style="{StaticResource SettingsScrollViewerStyle}">
-                        <Grid Style="{StaticResource SettingsGridStyle}">
-                            <StackPanel Spacing="{StaticResource SettingsCardSpacing}">
-
-                                <TextBlock Style="{StaticResource SettingsSectionHeaderTextBlockStyle}" />
-
-                                <dev:SettingsCard x:Uid="SettingsPageConfigName" HeaderIcon="{ui:FontIcon FontFamily={StaticResource IconFontFamily}, Glyph=&#xE8AC;}">
-                                    <StackPanel
-                                        Margin="0,6,0,0"
-                                        Orientation="Horizontal"
-                                        Spacing="6">
-                                        <TextBox Text="{x:Bind ViewModel.LiveStates.LyricsWindowStatus.Name, Mode=TwoWay}" TextWrapping="Wrap" />
-                                        <Button Content="{ui:FontIcon FontFamily={StaticResource IconFontFamily}, FontSize=12, Glyph=&#xE8FB;}" Style="{StaticResource GhostButtonStyle}" />
-                                    </StackPanel>
-                                </dev:SettingsCard>
-
-                                <dev:SettingsExpander
-                                    x:Uid="SettingsPageWorkArea"
-                                    HeaderIcon="{ui:FontIcon FontFamily={StaticResource IconFontFamily},
-                                                             Glyph=&#xE78B;}"
-                                    IsExpanded="{x:Bind ViewModel.LiveStates.LyricsWindowStatus.IsWorkArea, Mode=OneWay}">
-                                    <ToggleSwitch IsOn="{x:Bind ViewModel.LiveStates.LyricsWindowStatus.IsWorkArea, Mode=TwoWay}" />
-                                    <dev:SettingsExpander.Items>
-                                        <dev:SettingsCard x:Uid="SettingsPageWorkAreaHeight" IsEnabled="{x:Bind ViewModel.LiveStates.LyricsWindowStatus.IsWorkArea, Mode=OneWay}">
-                                            <uc:ExtendedSlider
-                                                Default="64"
-                                                Maximum="{x:Bind ViewModel.LiveStates.LyricsWindowStatus.MonitorBounds.Height, Mode=OneWay}"
-                                                Minimum="64"
-                                                Unit="px"
-                                                Value="{x:Bind ViewModel.LiveStates.LyricsWindowStatus.DockHeight, Mode=TwoWay}" />
-                                        </dev:SettingsCard>
-
-                                        <dev:SettingsCard x:Uid="SettingsPageDockPlacement" IsEnabled="{x:Bind ViewModel.LiveStates.LyricsWindowStatus.IsWorkArea, Mode=OneWay}">
-                                            <ComboBox SelectedIndex="{x:Bind ViewModel.LiveStates.LyricsWindowStatus.DockPlacement, Mode=TwoWay, Converter={StaticResource EnumToIntConverter}}">
-                                                <ComboBoxItem x:Uid="SettingsPageDockPlacementTop" />
-                                                <ComboBoxItem x:Uid="SettingsPageDockPlacementBottom" />
-                                            </ComboBox>
-                                        </dev:SettingsCard>
-
-                                        <dev:SettingsCard x:Uid="SettingsPageDockMonitor" IsEnabled="{x:Bind ViewModel.LiveStates.LyricsWindowStatus.IsWorkArea, Mode=OneWay}">
-                                            <StackPanel Orientation="Horizontal" Spacing="6">
-                                                <ComboBox ItemsSource="{x:Bind ViewModel.MonitorDeviceNames, Mode=OneWay}" SelectedItem="{x:Bind ViewModel.LiveStates.LyricsWindowStatus.MonitorDeviceName, Mode=TwoWay}" />
-                                                <Button
-                                                    Command="{x:Bind ViewModel.RefreshMonitorDeviceNamesCommand}"
-                                                    Content="{ui:FontIcon FontFamily={StaticResource IconFontFamily},
-                                                                          FontSize=12,
-                                                                          Glyph=&#xE72C;}"
-                                                    Style="{StaticResource GhostButtonStyle}" />
-                                            </StackPanel>
-                                        </dev:SettingsCard>
-
-                                    </dev:SettingsExpander.Items>
-                                </dev:SettingsExpander>
-
-                                <dev:SettingsExpander
-                                    x:Uid="SettingsPageAdaptEnvColor"
-                                    HeaderIcon="{ui:FontIcon FontFamily={StaticResource IconFontFamily},
-                                                             Glyph=&#xE88F;}"
-                                    IsExpanded="{x:Bind ViewModel.LiveStates.LyricsWindowStatus.IsAdaptToEnvironment, Mode=OneWay}">
-                                    <ToggleSwitch IsOn="{x:Bind ViewModel.LiveStates.LyricsWindowStatus.IsAdaptToEnvironment, Mode=TwoWay}" />
-                                    <dev:SettingsExpander.Items>
-                                        <dev: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" />
-                                                <ComboBoxItem x:Uid="SettingsPageEnvColorSampleInner" />
-                                                <ComboBoxItem x:Uid="SettingsPageEnvColorSampleEdge" />
-                                            </ComboBox>
-                                        </dev:SettingsCard>
-                                    </dev:SettingsExpander.Items>
-                                </dev:SettingsExpander>
-
-                                <dev:SettingsExpander
-                                    x:Uid="SettingsPageWindowBounds"
-                                    HeaderIcon="{ui:FontIcon FontFamily={StaticResource IconFontFamily},
-                                                             Glyph=&#xF16B;}"
-                                    IsExpanded="True">
-                                    <dev:SettingsExpander.Items>
-                                        <dev:SettingsCard Header="X">
-                                            <NumberBox
-                                                SmallChange="10"
-                                                SpinButtonPlacementMode="Inline"
-                                                Value="{x:Bind ViewModel.LiveStates.LyricsWindowStatus.WindowX, Mode=TwoWay}" />
-                                        </dev:SettingsCard>
-                                        <dev:SettingsCard Header="Y">
-                                            <NumberBox
-                                                SmallChange="10"
-                                                SpinButtonPlacementMode="Inline"
-                                                Value="{x:Bind ViewModel.LiveStates.LyricsWindowStatus.WindowY, Mode=TwoWay}" />
-                                        </dev:SettingsCard>
-                                        <dev:SettingsCard x:Uid="SettingsPageWidth">
-                                            <NumberBox
-                                                SmallChange="10"
-                                                SpinButtonPlacementMode="Inline"
-                                                Value="{x:Bind ViewModel.LiveStates.LyricsWindowStatus.WindowWidth, Mode=TwoWay}" />
-                                        </dev:SettingsCard>
-                                        <dev:SettingsCard x:Uid="SettingsPageHeight">
-                                            <NumberBox
-                                                SmallChange="10"
-                                                SpinButtonPlacementMode="Inline"
-                                                Value="{x:Bind ViewModel.LiveStates.LyricsWindowStatus.WindowHeight, Mode=TwoWay}" />
-                                        </dev:SettingsCard>
-                                    </dev:SettingsExpander.Items>
-                                </dev:SettingsExpander>
-
-                                <dev:SettingsExpander
-                                    x:Uid="SettingsPageAOT"
-                                    HeaderIcon="{ui:FontIcon FontFamily={StaticResource IconFontFamily},
-                                                             Glyph=&#xE718;}"
-                                    IsExpanded="True">
-                                    <ToggleSwitch IsOn="{x:Bind ViewModel.LiveStates.LyricsWindowStatus.IsAlwaysOnTop, Mode=TwoWay}" />
-                                    <dev:SettingsExpander.Items>
-                                        <dev:SettingsCard x:Uid="SettingsPageForceAlwaysOnTop" IsEnabled="{x:Bind ViewModel.LiveStates.LyricsWindowStatus.IsAlwaysOnTop, Mode=OneWay}">
-                                            <ToggleSwitch IsOn="{x:Bind ViewModel.LiveStates.LyricsWindowStatus.IsAlwaysOnTopPolling, Mode=TwoWay}" />
-                                        </dev:SettingsCard>
-                                    </dev:SettingsExpander.Items>
-                                </dev:SettingsExpander>
-
-                                <dev:SettingsCard x:Uid="SettingsPageHideWindow" HeaderIcon="{ui:FontIcon FontFamily={StaticResource IconFontFamily}, Glyph=&#xED1A;}">
-                                    <ToggleSwitch IsOn="{x:Bind ViewModel.LiveStates.LyricsWindowStatus.AutoShowOrHideWindow, Mode=TwoWay}" />
-                                </dev:SettingsCard>
-
-                                <dev:SettingsCard x:Uid="SettingsPageShowInSwitchers" HeaderIcon="{ui:FontIcon FontFamily={StaticResource IconFontFamily}, Glyph=&#xE7C4;}">
-                                    <ToggleSwitch IsOn="{x:Bind ViewModel.LiveStates.LyricsWindowStatus.IsShownInSwitchers, Mode=TwoWay}" />
-                                </dev:SettingsCard>
-
-                                <dev:SettingsCard x:Uid="SettingsPageClickThrough" HeaderIcon="{ui:FontIcon FontFamily={StaticResource IconFontFamily}, Glyph=&#xE7C9;}">
-                                    <ToggleSwitch IsOn="{x:Bind ViewModel.LiveStates.LyricsWindowStatus.IsClickThrough, Mode=TwoWay}" />
-                                </dev:SettingsCard>
-
-                                <dev:SettingsCard x:Uid="SettingsPageBorderless" HeaderIcon="{ui:FontIcon FontFamily={StaticResource IconFontFamily}, Glyph=&#xE8B2;}">
-                                    <ToggleSwitch IsOn="{x:Bind ViewModel.LiveStates.LyricsWindowStatus.IsBorderless, Mode=TwoWay}" />
-                                </dev:SettingsCard>
-
-                                <dev:SettingsCard x:Uid="SettingsPageDragArea" HeaderIcon="{ui:FontIcon FontFamily={StaticResource IconFontFamily}, Glyph=&#xEB41;}">
-                                    <ComboBox SelectedIndex="{x:Bind ViewModel.LiveStates.LyricsWindowStatus.TitleBarArea, Mode=TwoWay, Converter={StaticResource EnumToIntConverter}}">
-                                        <ComboBoxItem x:Uid="SettingsPageTitleBarAreaNone" />
-                                        <ComboBoxItem x:Uid="SettingsPageTitleBarAreaTop" />
-                                        <ComboBoxItem x:Uid="SettingsPageTitleBarAreaWhole" />
-                                    </ComboBox>
-                                </dev:SettingsCard>
-
-                            </StackPanel>
-                        </Grid>
-                    </ScrollViewer>
+                <controls:Case Value="Window">
+                    <uc:WindowSettingsControl LyricsWindowStatus="{x:Bind LyricsWindowStatus, Mode=OneWay}" />
                 </controls:Case>
 
                 <!--  Layout  -->
@@ -386,17 +236,17 @@
                         <Grid Style="{StaticResource SettingsGridStyle}">
                             <StackPanel Spacing="{StaticResource SettingsCardSpacing}">
 
-                                <TextBlock Style="{StaticResource SettingsSectionHeaderTextBlockStyle}" />
+                                <TextBlock x:Uid="SettingsPageLayout" Style="{StaticResource SettingsSectionHeaderTextBlockStyle}" />
 
                                 <dev:SettingsExpander x:Uid="SettingsPageDisplayTypeSwitcher" IsExpanded="True">
-                                    <ComboBox SelectedIndex="{x:Bind ViewModel.LiveStates.LyricsWindowStatus.LyricsDisplayType, Mode=TwoWay, Converter={StaticResource EnumToIntConverter}}">
+                                    <ComboBox SelectedIndex="{x:Bind LyricsWindowStatus.LyricsDisplayType, Mode=TwoWay, Converter={StaticResource EnumToIntConverter}}">
                                         <ComboBoxItem x:Uid="MainPageAlbumArtOnly" />
                                         <ComboBoxItem x:Uid="MainPageLyriscOnly" />
                                         <ComboBoxItem x:Uid="MainPageSplitView" />
                                     </ComboBox>
                                     <dev:SettingsExpander.Items>
                                         <dev:SettingsCard x:Uid="SettingsPageLayoutOrientation">
-                                            <ComboBox SelectedIndex="{x:Bind ViewModel.LiveStates.LyricsWindowStatus.LyricsLayoutOrientation, Mode=TwoWay, Converter={StaticResource EnumToIntConverter}}">
+                                            <ComboBox SelectedIndex="{x:Bind LyricsWindowStatus.LyricsLayoutOrientation, Mode=TwoWay, Converter={StaticResource EnumToIntConverter}}">
                                                 <ComboBoxItem x:Uid="SettingsPageLayoutOrientationHorizontal" />
                                                 <ComboBoxItem x:Uid="SettingsPageLayoutOrientationVertical" />
                                             </ComboBox>
@@ -411,22 +261,27 @@
 
                 <!--  Album art area style  -->
                 <controls:Case Value="AlbumArtStyle">
-                    <uc:AlbumArtLayoutSettingsControl AlbumArtLayoutSettings="{x:Bind ViewModel.LiveStates.LyricsWindowStatus.AlbumArtLayoutSettings, Mode=OneWay}" />
+                    <uc:AlbumArtAreaStyleSettingsControl AlbumArtLayoutSettings="{x:Bind LyricsWindowStatus.AlbumArtLayoutSettings, Mode=OneWay}" />
+                </controls:Case>
+
+                <!--  Album art area effect  -->
+                <controls:Case Value="AlbumArtEffect">
+                    <uc:AlbumArtAreaEffectSettingsControl AlbumArtAreaEffectSettings="{x:Bind LyricsWindowStatus.AlbumArtAreaEffectSettings, Mode=OneWay}" />
                 </controls:Case>
 
                 <!--  Lyrics style  -->
                 <controls:Case Value="LyricsStyle">
-                    <uc:LyricsStyleSettingsControl LyricsStyleSettings="{x:Bind ViewModel.LiveStates.LyricsWindowStatus.LyricsStyleSettings, Mode=OneWay}" />
+                    <uc:LyricsStyleSettingsControl LyricsStyleSettings="{x:Bind LyricsWindowStatus.LyricsStyleSettings, Mode=OneWay}" />
                 </controls:Case>
 
                 <!--  Lyrics  effect  -->
                 <controls:Case Value="LyricsEffect">
-                    <uc:LyricsEffectSettingsControl LyricsEffectSettings="{x:Bind ViewModel.LiveStates.LyricsWindowStatus.LyricsEffectSettings, Mode=OneWay}" />
+                    <uc:LyricsEffectSettingsControl LyricsEffectSettings="{x:Bind LyricsWindowStatus.LyricsEffectSettings, Mode=OneWay}" />
                 </controls:Case>
 
                 <!--  Lyrics background  -->
                 <controls:Case Value="LyricsBackground">
-                    <uc:LyricsBackgroundSettingsControl LyricsBackgroundSettings="{x:Bind ViewModel.LiveStates.LyricsWindowStatus.LyricsBackgroundSettings, Mode=OneWay}" />
+                    <uc:LyricsBackgroundSettingsControl LyricsBackgroundSettings="{x:Bind LyricsWindowStatus.LyricsBackgroundSettings, Mode=OneWay}" />
                 </controls:Case>
 
             </controls:SwitchPresenter>

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Controls/LyricsWindowSettingsControl.xaml.cs

@@ -1,7 +1,7 @@
 using BetterLyrics.WinUI3.Helper;
+using BetterLyrics.WinUI3.Hooks;
 using BetterLyrics.WinUI3.Models;
 using BetterLyrics.WinUI3.Serialization;
-using BetterLyrics.WinUI3.Services.LiveStatesService;
 using BetterLyrics.WinUI3.Services.SettingsService;
 using BetterLyrics.WinUI3.ViewModels;
 using BetterLyrics.WinUI3.Views;
@@ -9,7 +9,6 @@ using CommunityToolkit.Mvvm.DependencyInjection;
 using Microsoft.UI.Xaml;
 using Microsoft.UI.Xaml.Controls;
 using Microsoft.UI.Xaml.Input;
-using NTextCat.Commons;
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
@@ -25,7 +24,15 @@ namespace BetterLyrics.WinUI3.Controls
         public LyricsWindowSettingsControlViewModel ViewModel => (LyricsWindowSettingsControlViewModel)DataContext;
 
         private readonly ISettingsService _settingsService = Ioc.Default.GetRequiredService<ISettingsService>();
-        private readonly ILiveStatesService _liveStatesService = Ioc.Default.GetRequiredService<ILiveStatesService>();
+
+        public LyricsWindowStatus LyricsWindowStatus
+        {
+            get { return (LyricsWindowStatus)GetValue(LyricsWindowStatusProperty); }
+            set { SetValue(LyricsWindowStatusProperty, value); }
+        }
+
+        public static readonly DependencyProperty LyricsWindowStatusProperty =
+            DependencyProperty.Register(nameof(LyricsWindowStatus), typeof(LyricsWindowStatus), typeof(LyricsWindowSettingsControl), new PropertyMetadata(default));
 
         public LyricsWindowSettingsControl()
         {
@@ -39,10 +46,9 @@ namespace BetterLyrics.WinUI3.Controls
             {
                 if (menuFlyoutItem.DataContext is LyricsWindowStatus data)
                 {
-                    if (_liveStatesService.LiveStates.LyricsWindowStatus == data)
-                    {
-                        _liveStatesService.LiveStates.LyricsWindowStatus = ViewModel.AppSettings.WindowBoundsRecords.First();
-                    }
+                    var windows = WindowHook.GetWindows<NowPlayingWindow>();
+                    var window = windows.FirstOrDefault(x => x.LyricsWindowStatus == data);
+                    window?.CloseWindow();
                     ViewModel.AppSettings.WindowBoundsRecords.Remove(data);
                 }
             }
@@ -50,12 +56,11 @@ namespace BetterLyrics.WinUI3.Controls
 
         private void SetDefaultMenuFlyoutItem_Click(object sender, RoutedEventArgs e)
         {
-            if (sender is MenuFlyoutItem menuFlyoutItem)
+            if (sender is FrameworkElement element)
             {
-                if (menuFlyoutItem.DataContext is LyricsWindowStatus data)
+                if (element.DataContext is LyricsWindowStatus data)
                 {
-                    ViewModel.AppSettings.WindowBoundsRecords.ForEach(x => x.IsDefault = false);
-                    data.IsDefault = true;
+                    data.IsDefault = !data.IsDefault;
                 }
             }
         }
@@ -115,17 +120,6 @@ namespace BetterLyrics.WinUI3.Controls
             }
         }
 
-        private void Pivot_SelectionChanged(object sender, SelectionChangedEventArgs e)
-        {
-            if (sender is Pivot pivot)
-            {
-                if (pivot.SelectedItem is PivotItem pivotItem)
-                {
-                    ViewModel?.ListViewSelectedItemTag = pivotItem.Tag;
-                }
-            }
-        }
-
         private async void ImportButton_Click(object sender, RoutedEventArgs e)
         {
             string[] fileTypeFilter = [".json"];
@@ -154,5 +148,64 @@ namespace BetterLyrics.WinUI3.Controls
         {
             ViewModel.DisplayPanelHeight = e.NewSize.Height;
         }
+
+        private void ConfigButton_Click(object sender, RoutedEventArgs e)
+        {
+            WindowSelectorBarItem.Visibility = LayoutSelectorBarItem.Visibility = Visibility.Visible;
+            ConfigSelectorBar.SelectedItem = WindowSelectorBarItem;
+            LyricsWindowStatus = (LyricsWindowStatus)((Button)sender).DataContext;
+            ViewModel.OpenConfigPanel();
+        }
+
+        private void EmbeddedConfigButton_Click(object sender, RoutedEventArgs e)
+        {
+            WindowSelectorBarItem.Visibility = LayoutSelectorBarItem.Visibility = Visibility.Collapsed;
+            ConfigSelectorBar.SelectedItem = AlbumArtStyleSelectorBarItem;
+            LyricsWindowStatus = _settingsService.AppSettings.MusicGallerySettings.LyricsWindowStatus;
+            ViewModel.OpenConfigPanel();
+        }
+
+        private void DemoWindowGrid_Tapped(object sender, TappedRoutedEventArgs e)
+        {
+            var status = (LyricsWindowStatus)(((FrameworkElement)sender).DataContext);
+            // <20>࿪ģʽ
+            if (_settingsService.AppSettings.GeneralSettings.MultiNowPlayingWindowMode)
+            {
+                WindowHook.OpenOrShowWindow<NowPlayingWindow>(status);
+            }
+            // <20><><EFBFBD><EFBFBD>ģʽ
+            else
+            {
+                var openedWindows = WindowHook.GetWindows<NowPlayingWindow>();
+                foreach (var item in openedWindows.Where(x => x.LyricsWindowStatus != status))
+                {
+                    item.CloseWindow();
+                }
+                WindowHook.OpenOrShowWindow<NowPlayingWindow>(status);
+            }
+        }
+
+        private void ConfigSelectorBar_SelectionChanged(SelectorBar sender, SelectorBarSelectionChangedEventArgs args)
+        {
+            if (sender is SelectorBar bar)
+            {
+                if (bar.SelectedItem is SelectorBarItem item)
+                {
+                    ViewModel?.SelectorBarSelectedItemTag = item.Tag;
+                }
+            }
+        }
+
+        private void CloseStatusButton_Click(object sender, RoutedEventArgs e)
+        {
+            if (sender is FrameworkElement element)
+            {
+                if (element.DataContext is LyricsWindowStatus data)
+                {
+                    var window = WindowHook.GetWindows<NowPlayingWindow>().FirstOrDefault(x => x.LyricsWindowStatus == data);
+                    window?.CloseWindow();
+                }
+            }
+        }
     }
 }

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Controls/LyricsWindowSwitchControl.xaml

@@ -44,8 +44,9 @@
 
             <ListView
                 Margin="48,56"
+                ItemContainerStyle="{StaticResource ListViewStretchedItemContainerStyle}"
                 ItemsSource="{x:Bind ViewModel.AppSettings.WindowBoundsRecords, Mode=OneWay}"
-                SelectedItem="{x:Bind ViewModel.LiveStates.LyricsWindowStatus, Mode=TwoWay}">
+                SelectionMode="None">
                 <ItemsControl.ItemsPanel>
                     <ItemsPanelTemplate>
                         <controls:WrapPanel HorizontalSpacing="0" VerticalSpacing="0" />
@@ -54,12 +55,14 @@
                 <ListView.ItemTemplate>
                     <DataTemplate>
                         <Grid
-                            Margin="0,10"
-                            Padding="5"
-                            AllowFocusOnInteraction="True"
+                            Margin="16"
                             CornerRadius="4"
                             Tapped="Grid_Tapped">
-                            <uc:DemoWindowGrid LyricsWindowStatus="{Binding}" />
+                            <Border
+                                BorderBrush="{ThemeResource AccentAAFillColorDefaultBrush}"
+                                BorderThickness="4"
+                                Visibility="{Binding IsOpened, Mode=OneWay, Converter={StaticResource BoolToVisibilityConverter}}" />
+                            <uc:DemoWindowGrid Margin="4" LyricsWindowStatus="{Binding}" />
                         </Grid>
                     </DataTemplate>
                 </ListView.ItemTemplate>

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Controls/LyricsWindowSwitchControl.xaml.cs

@@ -1,10 +1,13 @@
 using BetterLyrics.WinUI3.Hooks;
+using BetterLyrics.WinUI3.Models;
+using BetterLyrics.WinUI3.Services.SettingsService;
 using BetterLyrics.WinUI3.ViewModels;
 using BetterLyrics.WinUI3.Views;
 using CommunityToolkit.Mvvm.DependencyInjection;
 using Microsoft.UI.Xaml;
 using Microsoft.UI.Xaml.Controls;
 using Microsoft.UI.Xaml.Input;
+using System.Linq;
 using System.Threading.Tasks;
 
 // To learn more about WinUI, the WinUI project structure,
@@ -16,6 +19,8 @@ namespace BetterLyrics.WinUI3.Controls
     {
         public LyricsWindowSwitchControlViewModel ViewModel => (LyricsWindowSwitchControlViewModel)DataContext;
 
+        private readonly ISettingsService _settingsService = Ioc.Default.GetRequiredService<ISettingsService>();
+
         public LyricsWindowSwitchControl()
         {
             InitializeComponent();
@@ -24,6 +29,22 @@ namespace BetterLyrics.WinUI3.Controls
 
         private async void Grid_Tapped(object sender, TappedRoutedEventArgs e)
         {
+            var status = (LyricsWindowStatus)(((FrameworkElement)sender).DataContext);
+            // <20>࿪ģʽ
+            if (_settingsService.AppSettings.GeneralSettings.MultiNowPlayingWindowMode)
+            {
+                WindowHook.OpenOrShowWindow<NowPlayingWindow>(status);
+            }
+            // <20><><EFBFBD><EFBFBD>ģʽ
+            else
+            {
+                var openedWindows = WindowHook.GetWindows<NowPlayingWindow>();
+                foreach (var item in openedWindows.Where(x => x.LyricsWindowStatus != status))
+                {
+                    item.CloseWindow();
+                }
+                WindowHook.OpenOrShowWindow<NowPlayingWindow>(status);
+            }
             await HideAsync();
         }
 
@@ -37,7 +58,7 @@ namespace BetterLyrics.WinUI3.Controls
             var lyricsWindowSwitchWindow = WindowHook.GetWindow<LyricsWindowSwitchWindow>();
             lyricsWindowSwitchWindow?.ViewModel.RootGridOpacity = 0;
             await Task.Delay(300);
-            WindowHook.HideWindow<LyricsWindowSwitchWindow>();
+            lyricsWindowSwitchWindow?.HideWindow();
         }
 
         private void ShadowRect_Loaded(object sender, RoutedEventArgs e)

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Controls/NowPlayingBar.xaml

@@ -0,0 +1,433 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<UserControl
+    x:Class="BetterLyrics.WinUI3.Controls.NowPlayingBar"
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+    xmlns:interactivity="using:Microsoft.Xaml.Interactivity"
+    xmlns:local="using:BetterLyrics.WinUI3.Controls"
+    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    xmlns:ui="using:CommunityToolkit.WinUI"
+    mc:Ignorable="d">
+
+    <Grid x:Name="RootGrid">
+
+        <Grid
+            x:Name="BottomCommandGrid"
+            Background="{ThemeResource AcrylicInAppFillColorDefaultBrush}"
+            Opacity="{x:Bind ViewModel.BottomCommandGridOpacity, Mode=OneWay}"
+            PointerEntered="BottomCommandGrid_PointerEntered"
+            PointerExited="BottomCommandGrid_PointerExited">
+            <Grid.OpacityTransition>
+                <ScalarTransition />
+            </Grid.OpacityTransition>
+
+            <Grid x:Name="BottomCommandContent">
+
+                <Grid HorizontalAlignment="Left">
+                    <StackPanel
+                        x:Name="BottomLeftCommandStackPanel"
+                        Orientation="Horizontal"
+                        Spacing="3">
+
+                        <StackPanel
+                            x:Name="SongInfoStackPanel"
+                            Margin="8"
+                            Padding="8"
+                            VerticalAlignment="Center"
+                            CornerRadius="4"
+                            Opacity="{x:Bind ShowSongInfo, Mode=OneWay, Converter={StaticResource BoolToOpacityConverter}}"
+                            Orientation="Horizontal"
+                            Spacing="12"
+                            Tapped="SongInfoStackPanel_Tapped"
+                            Visibility="{x:Bind ShowSongInfo, Mode=OneWay, Converter={StaticResource BoolToVisibilityConverter}}">
+                            <StackPanel.OpacityTransition>
+                                <ScalarTransition />
+                            </StackPanel.OpacityTransition>
+                            <interactivity:Interaction.Behaviors>
+                                <interactivity:EventTriggerBehavior EventName="PointerEntered">
+                                    <interactivity:ChangePropertyAction PropertyName="Background" Value="{ThemeResource SubtleFillColorSecondaryBrush}" />
+                                </interactivity:EventTriggerBehavior>
+                                <interactivity:EventTriggerBehavior EventName="PointerExited">
+                                    <interactivity:ChangePropertyAction PropertyName="Background" Value="Transparent" />
+                                </interactivity:EventTriggerBehavior>
+                                <interactivity:EventTriggerBehavior EventName="PointerPressed">
+                                    <interactivity:ChangePropertyAction PropertyName="Background" Value="{ThemeResource SubtleFillColorTertiaryBrush}" />
+                                </interactivity:EventTriggerBehavior>
+                                <interactivity:EventTriggerBehavior EventName="PointerReleased">
+                                    <interactivity:ChangePropertyAction PropertyName="Background" Value="{ThemeResource SubtleFillColorSecondaryBrush}" />
+                                </interactivity:EventTriggerBehavior>
+                            </interactivity:Interaction.Behaviors>
+                            <Grid VerticalAlignment="Center" CornerRadius="4">
+                                <local:ImageSwitcher
+                                    x:Name="AlbumArtImageSwitcher"
+                                    Width="36"
+                                    Height="36" />
+                            </Grid>
+                            <StackPanel VerticalAlignment="Center">
+                                <TextBlock x:Name="TitleTextBlock" />
+                                <TextBlock
+                                    x:Name="ArtistsTextBlock"
+                                    FontSize="12"
+                                    Foreground="{ThemeResource TextFillColorSecondaryBrush}" />
+                            </StackPanel>
+                        </StackPanel>
+
+                        <StackPanel
+                            x:Name="TimeStackPanel"
+                            Margin="8"
+                            Padding="8"
+                            VerticalAlignment="Center"
+                            Opacity="{x:Bind ShowTime, Mode=OneWay, Converter={StaticResource BoolToOpacityConverter}}"
+                            Orientation="Horizontal"
+                            Spacing="2"
+                            Tapped="TimeStackPanel_Tapped"
+                            Visibility="{x:Bind ShowTime, Mode=OneWay, Converter={StaticResource BoolToVisibilityConverter}}">
+                            <StackPanel.OpacityTransition>
+                                <ScalarTransition />
+                            </StackPanel.OpacityTransition>
+                            <interactivity:Interaction.Behaviors>
+                                <interactivity:EventTriggerBehavior EventName="PointerEntered">
+                                    <interactivity:ChangePropertyAction PropertyName="Background" Value="{ThemeResource SubtleFillColorSecondaryBrush}" />
+                                </interactivity:EventTriggerBehavior>
+                                <interactivity:EventTriggerBehavior EventName="PointerExited">
+                                    <interactivity:ChangePropertyAction PropertyName="Background" Value="Transparent" />
+                                </interactivity:EventTriggerBehavior>
+                                <interactivity:EventTriggerBehavior EventName="PointerPressed">
+                                    <interactivity:ChangePropertyAction PropertyName="Background" Value="{ThemeResource SubtleFillColorTertiaryBrush}" />
+                                </interactivity:EventTriggerBehavior>
+                                <interactivity:EventTriggerBehavior EventName="PointerReleased">
+                                    <interactivity:ChangePropertyAction PropertyName="Background" Value="{ThemeResource SubtleFillColorSecondaryBrush}" />
+                                </interactivity:EventTriggerBehavior>
+                            </interactivity:Interaction.Behaviors>
+                            <TextBlock Foreground="{ThemeResource TextFillColorSecondaryBrush}" Text="{Binding ElementName=TimelineSlider, Path=Value, Converter={StaticResource SecondsToFormattedTimeConverter}}" />
+                            <TextBlock Foreground="{ThemeResource TextFillColorSecondaryBrush}" Text="/" />
+                            <TextBlock Text="{Binding ElementName=TimelineSlider, Path=Maximum, Converter={StaticResource SecondsToFormattedTimeConverter}}" />
+                        </StackPanel>
+
+                    </StackPanel>
+                </Grid>
+
+                <Grid HorizontalAlignment="Center">
+                    <StackPanel
+                        x:Name="BottomCenterCommandStackPanel"
+                        Padding="16"
+                        Orientation="Horizontal"
+                        Spacing="3">
+                        <Button
+                            Command="{x:Bind ViewModel.PreviousSongCommand}"
+                            Content="{ui:FontIcon FontFamily={StaticResource IconFontFamily},
+                                                  Glyph=&#xE622;}"
+                            Style="{StaticResource GhostButtonStyle}" />
+                        <Button
+                            Command="{x:Bind ViewModel.PauseSongCommand}"
+                            Content="{ui:FontIcon FontFamily={StaticResource IconFontFamily},
+                                                  Glyph=&#xF8AE;}"
+                            Style="{StaticResource GhostButtonStyle}">
+                            <interactivity:Interaction.Behaviors>
+                                <interactivity:DataTriggerBehavior
+                                    Binding="{x:Bind ViewModel.MediaSessionsService.CurrentIsPlaying, Mode=OneWay}"
+                                    ComparisonCondition="Equal"
+                                    Value="True">
+                                    <interactivity:ChangePropertyAction PropertyName="Visibility" Value="Visible" />
+                                </interactivity:DataTriggerBehavior>
+                                <interactivity:DataTriggerBehavior
+                                    Binding="{x:Bind ViewModel.MediaSessionsService.CurrentIsPlaying, Mode=OneWay}"
+                                    ComparisonCondition="Equal"
+                                    Value="False">
+                                    <interactivity:ChangePropertyAction PropertyName="Visibility" Value="Collapsed" />
+                                </interactivity:DataTriggerBehavior>
+                            </interactivity:Interaction.Behaviors>
+                        </Button>
+                        <Button
+                            Command="{x:Bind ViewModel.PlaySongCommand}"
+                            Content="{ui:FontIcon FontFamily={StaticResource IconFontFamily},
+                                                  Glyph=&#xF5B0;}"
+                            Style="{StaticResource GhostButtonStyle}">
+                            <interactivity:Interaction.Behaviors>
+                                <interactivity:DataTriggerBehavior
+                                    Binding="{x:Bind ViewModel.MediaSessionsService.CurrentIsPlaying, Mode=OneWay}"
+                                    ComparisonCondition="Equal"
+                                    Value="True">
+                                    <interactivity:ChangePropertyAction PropertyName="Visibility" Value="Collapsed" />
+                                </interactivity:DataTriggerBehavior>
+                                <interactivity:DataTriggerBehavior
+                                    Binding="{x:Bind ViewModel.MediaSessionsService.CurrentIsPlaying, Mode=OneWay}"
+                                    ComparisonCondition="Equal"
+                                    Value="False">
+                                    <interactivity:ChangePropertyAction PropertyName="Visibility" Value="Visible" />
+                                </interactivity:DataTriggerBehavior>
+                            </interactivity:Interaction.Behaviors>
+                        </Button>
+                        <Button
+                            Command="{x:Bind ViewModel.NextSongCommand}"
+                            Content="{ui:FontIcon FontFamily={StaticResource IconFontFamily},
+                                                  Glyph=&#xE623;}"
+                            Style="{StaticResource GhostButtonStyle}" />
+                    </StackPanel>
+                </Grid>
+
+                <Grid HorizontalAlignment="Right">
+                    <StackPanel
+                        x:Name="BottomRightCommandStackPanel"
+                        Padding="16"
+                        Orientation="Horizontal"
+                        Spacing="3">
+
+                        <!--  Volume  -->
+                        <Button Click="VolumeButton_Click" Style="{StaticResource GhostButtonStyle}">
+                            <Grid>
+
+                                <!--  Volumn: 0  -->
+                                <FontIcon FontFamily="{StaticResource IconFontFamily}" Glyph="&#xE74F;">
+                                    <FontIcon.OpacityTransition>
+                                        <ScalarTransition />
+                                    </FontIcon.OpacityTransition>
+                                    <interactivity:Interaction.Behaviors>
+                                        <interactivity:DataTriggerBehavior
+                                            Binding="{x:Bind ViewModel.Volume, Mode=OneWay}"
+                                            ComparisonCondition="Equal"
+                                            Value="0">
+                                            <interactivity:ChangePropertyAction PropertyName="Opacity" Value="1" />
+                                        </interactivity:DataTriggerBehavior>
+                                        <interactivity:DataTriggerBehavior
+                                            Binding="{x:Bind ViewModel.Volume, Mode=OneWay}"
+                                            ComparisonCondition="NotEqual"
+                                            Value="0">
+                                            <interactivity:ChangePropertyAction PropertyName="Opacity" Value="0" />
+                                        </interactivity:DataTriggerBehavior>
+                                    </interactivity:Interaction.Behaviors>
+                                </FontIcon>
+
+                                <!--  Volumn: 1-32  -->
+                                <FontIcon
+                                    x:Name="VolumeLevel1"
+                                    FontFamily="{StaticResource IconFontFamily}"
+                                    Glyph="&#xE993;">
+                                    <FontIcon.OpacityTransition>
+                                        <ScalarTransition />
+                                    </FontIcon.OpacityTransition>
+                                    <interactivity:Interaction.Behaviors>
+                                        <interactivity:DataTriggerBehavior
+                                            Binding="{x:Bind ViewModel.Volume, Mode=OneWay}"
+                                            ComparisonCondition="GreaterThanOrEqual"
+                                            Value="1">
+                                            <interactivity:ChangePropertyAction PropertyName="Opacity" Value="1" />
+                                        </interactivity:DataTriggerBehavior>
+                                        <interactivity:DataTriggerBehavior
+                                            Binding="{x:Bind ViewModel.Volume, Mode=OneWay}"
+                                            ComparisonCondition="LessThan"
+                                            Value="1">
+                                            <interactivity:ChangePropertyAction PropertyName="Opacity" Value="0" />
+                                        </interactivity:DataTriggerBehavior>
+                                    </interactivity:Interaction.Behaviors>
+                                </FontIcon>
+
+                                <!--  Volumn: 33-65  -->
+                                <FontIcon
+                                    x:Name="VolumeLevel2"
+                                    FontFamily="{StaticResource IconFontFamily}"
+                                    Glyph="&#xE994;">
+                                    <FontIcon.OpacityTransition>
+                                        <ScalarTransition />
+                                    </FontIcon.OpacityTransition>
+                                    <interactivity:Interaction.Behaviors>
+                                        <interactivity:DataTriggerBehavior
+                                            Binding="{x:Bind ViewModel.Volume, Mode=OneWay}"
+                                            ComparisonCondition="GreaterThanOrEqual"
+                                            Value="33">
+                                            <interactivity:ChangePropertyAction PropertyName="Opacity" Value="1" />
+                                        </interactivity:DataTriggerBehavior>
+                                        <interactivity:DataTriggerBehavior
+                                            Binding="{x:Bind ViewModel.Volume, Mode=OneWay}"
+                                            ComparisonCondition="LessThan"
+                                            Value="33">
+                                            <interactivity:ChangePropertyAction PropertyName="Opacity" Value="0" />
+                                        </interactivity:DataTriggerBehavior>
+                                    </interactivity:Interaction.Behaviors>
+                                </FontIcon>
+
+                                <!--  Volumn: 66-100  -->
+                                <FontIcon
+                                    x:Name="VolumeLevel3"
+                                    FontFamily="{StaticResource IconFontFamily}"
+                                    Glyph="&#xE995;">
+                                    <FontIcon.OpacityTransition>
+                                        <ScalarTransition />
+                                    </FontIcon.OpacityTransition>
+                                    <interactivity:Interaction.Behaviors>
+                                        <interactivity:DataTriggerBehavior
+                                            Binding="{x:Bind ViewModel.Volume, Mode=OneWay}"
+                                            ComparisonCondition="GreaterThanOrEqual"
+                                            Value="66">
+                                            <interactivity:ChangePropertyAction PropertyName="Opacity" Value="1" />
+                                        </interactivity:DataTriggerBehavior>
+                                        <interactivity:DataTriggerBehavior
+                                            Binding="{x:Bind ViewModel.Volume, Mode=OneWay}"
+                                            ComparisonCondition="LessThan"
+                                            Value="66">
+                                            <interactivity:ChangePropertyAction PropertyName="Opacity" Value="0" />
+                                        </interactivity:DataTriggerBehavior>
+                                    </interactivity:Interaction.Behaviors>
+                                </FontIcon>
+                            </Grid>
+
+                            <Button.ContextFlyout>
+                                <Flyout x:Name="VolumeFlyout" ShouldConstrainToRootBounds="False">
+                                    <local:ExtendedSlider
+                                        Frequency="10"
+                                        IsSliderEnabled="False"
+                                        Maximum="100"
+                                        Minimum="0"
+                                        ResetButtonVisibility="Collapsed"
+                                        Unit="%"
+                                        ValueChangedByUser="ExtendedSlider_ValueChangedByUser"
+                                        Value="{x:Bind ViewModel.Volume, Mode=TwoWay}" />
+                                </Flyout>
+                            </Button.ContextFlyout>
+                        </Button>
+
+                        <!--  More  -->
+                        <Button Content="{ui:FontIcon FontFamily={StaticResource IconFontFamily}, Glyph=&#xE712;}" Style="{StaticResource GhostButtonStyle}">
+                            <Button.Flyout>
+                                <MenuFlyout>
+                                    <!--  Lyrics search window  -->
+                                    <MenuFlyoutItem
+                                        x:Uid="LyricsPageLyricsSearch"
+                                        Command="{x:Bind ViewModel.OpenLyricsSearchWindowCommand}"
+                                        Icon="{ui:FontIcon FontFamily={StaticResource IconFontFamily},
+                                                           Glyph=&#xE721;}" />
+                                    <!--  Lyrics window manager shortcut settings  -->
+                                    <MenuFlyoutItem
+                                        x:Uid="LyricsPageLyricsSettings"
+                                        Click="LyricsSettingsShortcutMenuFlyoutItem_Click"
+                                        Icon="{ui:FontIcon FontFamily={StaticResource IconFontFamily},
+                                                           Glyph=&#xE61F;}">
+                                        <MenuFlyoutItem.ContextFlyout>
+                                            <Flyout
+                                                x:Name="LyricsSettingsFlyout"
+                                                Closed="LyricsSettingsFlyout_Closed"
+                                                FlyoutPresenterStyle="{StaticResource FlyoutPageStyle}"
+                                                Placement="Right"
+                                                ShouldConstrainToRootBounds="False" />
+                                        </MenuFlyoutItem.ContextFlyout>
+                                    </MenuFlyoutItem>
+                                    <!--  Playback shortcut settings  -->
+                                    <MenuFlyoutItem
+                                        x:Uid="LyricsPagePlaybackSource"
+                                        Click="PlaybackSettingsShortcutMenuFlyoutItem_Click"
+                                        Icon="{ui:FontIcon FontFamily={StaticResource IconFontFamily},
+                                                           Glyph=&#xEA69;}">
+                                        <MenuFlyoutItem.ContextFlyout>
+                                            <Flyout
+                                                x:Name="PlaybackSettingsFlyout"
+                                                Closed="PlaybackSettingsFlyout_Closed"
+                                                FlyoutPresenterStyle="{StaticResource FlyoutPageStyle}"
+                                                Placement="Right"
+                                                ShouldConstrainToRootBounds="False" />
+                                        </MenuFlyoutItem.ContextFlyout>
+                                    </MenuFlyoutItem>
+                                    <!--  Settings  -->
+                                    <MenuFlyoutItem
+                                        x:Uid="LyricsPageSettings"
+                                        Command="{x:Bind ViewModel.OpenSettingsWindowCommand}"
+                                        Icon="{ui:FontIcon FontFamily={StaticResource IconFontFamily},
+                                                           Glyph=&#xE713;}" />
+                                </MenuFlyout>
+                            </Button.Flyout>
+                        </Button>
+
+                    </StackPanel>
+                </Grid>
+
+                <Slider
+                    x:Name="TimelineSlider"
+                    Margin="0,-12,0,0"
+                    HorizontalAlignment="Stretch"
+                    VerticalAlignment="Top"
+                    Maximum="{x:Bind ViewModel.MediaSessionsService.CurrentSongInfo.DurationMs, Mode=OneWay, Converter={StaticResource MillisecondsToSecondsConverter}}"
+                    Minimum="0"
+                    Style="{StaticResource GhostSliderStyle}"
+                    ThumbToolTipValueConverter="{StaticResource SecondsToFormattedTimeConverter}" />
+
+                <Grid
+                    x:Name="TimelineSliderLyricsLineInfo"
+                    Margin="0,-32,0,0"
+                    Padding="8,4"
+                    HorizontalAlignment="Left"
+                    VerticalAlignment="Top"
+                    Background="{ThemeResource AcrylicInAppFillColorDefaultBrush}"
+                    CornerRadius="6"
+                    Opacity="{x:Bind ViewModel.TimelineSliderThumbOpacity, Mode=OneWay}">
+                    <Grid.OpacityTransition>
+                        <ScalarTransition />
+                    </Grid.OpacityTransition>
+                    <Grid.TranslationTransition>
+                        <Vector3Transition />
+                    </Grid.TranslationTransition>
+                    <StackPanel Orientation="Horizontal" Spacing="6">
+                        <TextBlock
+                            Margin="0,0,0,2"
+                            Foreground="{ThemeResource TextFillColorSecondaryBrush}"
+                            Text="{x:Bind ViewModel.TimelineSliderThumbLyricsLine.StartMs, Converter={StaticResource MillisecondsToFormattedTimeConverter}, Mode=OneWay}" />
+                        <!--  TODO 原文翻译共同显示  -->
+                        <TextBlock Margin="0,0,0,2" Text="{x:Bind ViewModel.TimelineSliderThumbLyricsLine.OriginalText, Mode=OneWay}" />
+                    </StackPanel>
+                </Grid>
+                <Grid
+                    Height="32"
+                    Margin="0,-12,0,0"
+                    VerticalAlignment="Top"
+                    Background="Transparent"
+                    PointerEntered="TimelineSliderOverlay_PointerEntered"
+                    PointerExited="TimelineSliderOverlay_PointerExited"
+                    PointerMoved="TimelineSliderOverlay_PointerMoved"
+                    PointerPressed="TimelineSliderOverlay_PointerPressed" />
+            </Grid>
+
+        </Grid>
+
+        <!--  Bottom command flyout trigger  -->
+        <Grid
+            x:Name="BottomCommandFlyoutTrigger"
+            Height="12"
+            VerticalAlignment="Bottom"
+            Background="Transparent"
+            CornerRadius="3,3,0,0"
+            Opacity="{x:Bind ViewModel.BottomCommandFlyoutTriggerOpacity, Mode=OneWay}"
+            PointerEntered="BottomCommandFlyoutTrigger_PointerEntered"
+            PointerExited="BottomCommandFlyoutTrigger_PointerExited"
+            Tapped="BottomCommandFlyoutTrigger_Tapped">
+            <Grid.OpacityTransition>
+                <ScalarTransition />
+            </Grid.OpacityTransition>
+            <Grid
+                x:Name="BottomCommandFlyoutTriggerHint"
+                Width="150"
+                Margin="4"
+                Background="{ThemeResource TextFillColorPrimaryBrush}"
+                CornerRadius="2"
+                Translation="0,0,0">
+                <Grid.TranslationTransition>
+                    <Vector3Transition />
+                </Grid.TranslationTransition>
+            </Grid>
+            <Grid.ContextFlyout>
+                <Flyout x:Name="BottomCommandFlyout" ShouldConstrainToRootBounds="False">
+                    <Flyout.FlyoutPresenterStyle>
+                        <Style TargetType="FlyoutPresenter">
+                            <Setter Property="Padding" Value="0" />
+                            <Setter Property="MinWidth" Value="400" />
+                            <Setter Property="MinHeight" Value="100" />
+                            <Setter Property="CornerRadius" Value="12" />
+                        </Style>
+                    </Flyout.FlyoutPresenterStyle>
+                    <Grid x:Name="BottomCommandFlyoutContainer" VerticalAlignment="Bottom" />
+                </Flyout>
+            </Grid.ContextFlyout>
+        </Grid>
+
+
+    </Grid>
+
+</UserControl>

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Controls/NowPlayingBar.xaml.cs

@@ -0,0 +1,301 @@
+using BetterLyrics.WinUI3.Hooks;
+using BetterLyrics.WinUI3.Models;
+using BetterLyrics.WinUI3.Services.MediaSessionsService;
+using BetterLyrics.WinUI3.ViewModels;
+using BetterLyrics.WinUI3.Views;
+using CommunityToolkit.Mvvm.DependencyInjection;
+using CommunityToolkit.Mvvm.Messaging;
+using CommunityToolkit.Mvvm.Messaging.Messages;
+using Microsoft.UI.Xaml;
+using Microsoft.UI.Xaml.Controls;
+using Microsoft.UI.Xaml.Input;
+using Microsoft.UI.Xaml.Media.Imaging;
+using System;
+using System.Numerics;
+
+// To learn more about WinUI, the WinUI project structure,
+// and more about our project templates, see: http://aka.ms/winui-project-info.
+
+namespace BetterLyrics.WinUI3.Controls;
+
+public sealed partial class NowPlayingBar : UserControl,
+    IRecipient<PropertyChangedMessage<SongInfo?>>,
+    IRecipient<PropertyChangedMessage<BitmapImage?>>,
+    IRecipient<PropertyChangedMessage<TimeSpan>>
+{
+    public NowPlayingBarViewModel ViewModel => (NowPlayingBarViewModel)DataContext;
+
+    public event EventHandler? SongInfoTapped;
+    public event EventHandler? TimeTapped;
+
+    public bool ShowTime
+    {
+        get { return (bool)GetValue(ShowTimeProperty); }
+        set { SetValue(ShowTimeProperty, value); }
+    }
+
+    public static readonly DependencyProperty ShowTimeProperty =
+        DependencyProperty.Register(nameof(ShowTime), typeof(bool), typeof(NowPlayingBar), new PropertyMetadata(false));
+
+    public bool ShowSongInfo
+    {
+        get { return (bool)GetValue(ShowSongInfoProperty); }
+        set { SetValue(ShowSongInfoProperty, value); }
+    }
+
+    public static readonly DependencyProperty ShowSongInfoProperty =
+        DependencyProperty.Register(nameof(ShowSongInfo), typeof(bool), typeof(NowPlayingBar), new PropertyMetadata(false));
+
+    public bool IsCompactMode
+    {
+        get { return (bool)GetValue(IsCompactModeProperty); }
+        set { SetValue(IsCompactModeProperty, value); }
+    }
+
+    public static readonly DependencyProperty IsCompactModeProperty =
+        DependencyProperty.Register(nameof(IsCompactMode), typeof(bool), typeof(NowPlayingBar), new PropertyMetadata(false, OnDependencyPropertyChanged));
+
+    public bool IsAutoHideEnabled
+    {
+        get { return (bool)GetValue(IsAutoHideEnabledProperty); }
+        set { SetValue(IsAutoHideEnabledProperty, value); }
+    }
+
+    public static readonly DependencyProperty IsAutoHideEnabledProperty =
+        DependencyProperty.Register(nameof(IsAutoHideEnabled), typeof(bool), typeof(NowPlayingBar), new PropertyMetadata(false, OnDependencyPropertyChanged));
+
+    private bool _isPointerInBottomCommandGrid = false;
+
+    public NowPlayingBar()
+    {
+        InitializeComponent();
+        DataContext = Ioc.Default.GetRequiredService<NowPlayingBarViewModel>();
+
+        WeakReferenceMessenger.Default.RegisterAll(this);
+    }
+
+    private static void OnDependencyPropertyChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
+    {
+        if (d is NowPlayingBar self)
+        {
+            if (e.Property == IsCompactModeProperty)
+            {
+                self.OnIsCompactModeChanged();
+            }
+            else if (e.Property == IsAutoHideEnabledProperty)
+            {
+                self.OnIsAutoHideEnabledChanged();
+            }
+        }
+    }
+
+    private void OnIsAutoHideEnabledChanged()
+    {
+        if (IsAutoHideEnabled)
+        {
+            if (!_isPointerInBottomCommandGrid)
+            {
+                ViewModel.BottomCommandGridOpacity = 0;
+            }
+        }
+        else
+        {
+            ViewModel.BottomCommandGridOpacity = 1;
+        }
+    }
+
+    private void OnIsCompactModeChanged()
+    {
+        if (IsCompactMode)
+        {
+            if (BottomCommandGrid.Children.Count != 0)
+            {
+                BottomCommandGrid.Children.Remove(BottomCommandContent);
+                BottomCommandFlyoutContainer.Children.Add(BottomCommandContent);
+            }
+            BottomCommandFlyoutTriggerHint.Translation = new Vector3(0, 0, 0);
+        }
+        else
+        {
+            if (BottomCommandFlyoutContainer.Children.Count != 0)
+            {
+                BottomCommandFlyout.Hide();
+                BottomCommandFlyoutContainer.Children.Remove(BottomCommandContent);
+                BottomCommandGrid.Children.Add(BottomCommandContent);
+            }
+            BottomCommandFlyoutTriggerHint.Translation = new Vector3(0, 12, 0);
+        }
+    }
+
+    private void PlaybackSettingsShortcutMenuFlyoutItem_Click(object sender, RoutedEventArgs e)
+    {
+        PlaybackSettingsFlyout.Content = new PlaybackSettingsControl
+        {
+            MaxHeight = 500,
+            MaxWidth = 850,
+        };
+        PlaybackSettingsFlyout.ShowAt(BottomRightCommandStackPanel);
+    }
+
+    private void VolumeButton_Click(object sender, RoutedEventArgs e)
+    {
+        VolumeFlyout.ShowAt(BottomRightCommandStackPanel);
+    }
+
+    private void PlaybackSettingsFlyout_Closed(object sender, object e)
+    {
+        PlaybackSettingsFlyout.Content = null;
+    }
+
+    private void LyricsSettingsFlyout_Closed(object sender, object e)
+    {
+        LyricsSettingsFlyout.Content = null;
+    }
+
+    private void LyricsSettingsShortcutMenuFlyoutItem_Click(object sender, RoutedEventArgs e)
+    {
+        LyricsSettingsFlyout.Content = new LyricsWindowSettingsControl
+        {
+            MaxHeight = 500,
+            MaxWidth = 850,
+        };
+        LyricsSettingsFlyout.ShowAt(BottomRightCommandStackPanel);
+    }
+
+    private void TimelineSliderOverlay_PointerPressed(object sender, Microsoft.UI.Xaml.Input.PointerRoutedEventArgs e)
+    {
+        var grid = (Grid)sender;
+        var pos = e.GetCurrentPoint(grid).Position;
+        var ratio = pos.X / grid.ActualWidth;
+        ViewModel.MediaSessionsService.ChangePosition(TimelineSlider.Maximum * ratio);
+    }
+
+    private void TimelineSliderOverlay_PointerMoved(object sender, Microsoft.UI.Xaml.Input.PointerRoutedEventArgs e)
+    {
+        float targetX;
+        var grid = (Grid)sender;
+        var pos = e.GetCurrentPoint(grid).Position;
+        var ratio = pos.X / grid.ActualWidth;
+        ViewModel.TimelineSliderThumbSeconds = TimelineSlider.Maximum * ratio;
+        if (pos.X + TimelineSliderLyricsLineInfo.ActualWidth > grid.ActualWidth)
+        {
+            targetX = (float)(grid.ActualWidth - TimelineSliderLyricsLineInfo.ActualWidth);
+        }
+        else
+        {
+            targetX = (float)pos.X;
+        }
+        TimelineSliderLyricsLineInfo.Translation = new Vector3(targetX, 0, 0);
+    }
+
+    private void TimelineSliderOverlay_PointerEntered(object sender, Microsoft.UI.Xaml.Input.PointerRoutedEventArgs e)
+    {
+        ViewModel.TimelineSliderThumbOpacity = 0.7f;
+    }
+
+    private void TimelineSliderOverlay_PointerExited(object sender, Microsoft.UI.Xaml.Input.PointerRoutedEventArgs e)
+    {
+        ViewModel.TimelineSliderThumbOpacity = 0f;
+    }
+
+    private void ExtendedSlider_ValueChangedByUser(object sender, Events.ExtendedSliderValueChangedByUserEventArgs e)
+    {
+        SystemVolumeHook.MasterVolume = ViewModel.Volume;
+    }
+
+    private void LyricsSearchShortcutButton_Click(object sender, RoutedEventArgs e)
+    {
+        WindowHook.OpenOrShowWindow<LyricsSearchWindow>();
+    }
+
+    private void SongInfoStackPanel_Tapped(object sender, TappedRoutedEventArgs e)
+    {
+        SongInfoTapped?.Invoke(this, EventArgs.Empty);
+    }
+
+    private void TimeStackPanel_Tapped(object sender, TappedRoutedEventArgs e)
+    {
+        TimeTapped?.Invoke(this, EventArgs.Empty);
+    }
+
+    private void BottomCommandGrid_PointerEntered(object sender, Microsoft.UI.Xaml.Input.PointerRoutedEventArgs e)
+    {
+        _isPointerInBottomCommandGrid = true;
+        if (IsAutoHideEnabled && BottomCommandGrid.Children.Count != 0)
+        {
+            ViewModel.BottomCommandGridOpacity = 1f;
+        }
+        e.Handled = true;
+    }
+
+    private void BottomCommandGrid_PointerExited(object sender, Microsoft.UI.Xaml.Input.PointerRoutedEventArgs e)
+    {
+        _isPointerInBottomCommandGrid = false;
+        if (IsAutoHideEnabled && BottomCommandGrid.Children.Count != 0)
+        {
+            ViewModel.BottomCommandGridOpacity = 0f;
+        }
+        e.Handled = true;
+    }
+
+    private void BottomCommandFlyoutTrigger_PointerEntered(object sender, Microsoft.UI.Xaml.Input.PointerRoutedEventArgs e)
+    {
+        if (BottomCommandFlyoutContainer.Children.Count != 0)
+        {
+            ViewModel.BottomCommandFlyoutTriggerOpacity = 1f;
+        }
+    }
+
+    private void BottomCommandFlyoutTrigger_PointerExited(object sender, Microsoft.UI.Xaml.Input.PointerRoutedEventArgs e)
+    {
+        if (BottomCommandFlyoutContainer.Children.Count != 0)
+        {
+            ViewModel.BottomCommandFlyoutTriggerOpacity = 0f;
+        }
+    }
+
+    private void BottomCommandFlyoutTrigger_Tapped(object sender, Microsoft.UI.Xaml.Input.TappedRoutedEventArgs e)
+    {
+        if (BottomCommandFlyoutContainer.Children.Count != 0)
+        {
+            BottomCommandFlyout.ShowAt(BottomCommandFlyoutTrigger);
+        }
+    }
+
+    public void Receive(PropertyChangedMessage<SongInfo?> message)
+    {
+        if (message.Sender is IMediaSessionsService)
+        {
+            if (message.PropertyName == nameof(IMediaSessionsService.CurrentSongInfo))
+            {
+                TitleTextBlock.Text = message.NewValue?.Title;
+                ArtistsTextBlock.Text = message.NewValue?.DisplayArtists;
+            }
+        }
+    }
+    public void Receive(PropertyChangedMessage<BitmapImage?> message)
+    {
+        if (message.Sender is IMediaSessionsService)
+        {
+            if (message.PropertyName == nameof(IMediaSessionsService.AlbumArtBitmapImage))
+            {
+                AlbumArtImageSwitcher.Source = message.NewValue;
+            }
+        }
+    }
+
+    public void Receive(PropertyChangedMessage<TimeSpan> message)
+    {
+        if (message.Sender is IMediaSessionsService)
+        {
+            if (message.PropertyName == nameof(IMediaSessionsService.CurrentPosition))
+            {
+                DispatcherQueue.TryEnqueue(() =>
+                {
+                    TimelineSlider.Value = message.NewValue.TotalSeconds;
+                });
+            }
+        }
+    }
+
+}

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Controls/PlaybackSettingsControl.xaml

@@ -22,8 +22,9 @@
             <ColumnDefinition Width="*" />
         </Grid.ColumnDefinitions>
 
-        <Grid Grid.Column="0" RowSpacing="18">
+        <Grid Grid.Column="0">
             <Grid.RowDefinitions>
+                <RowDefinition Height="Auto" />
                 <RowDefinition Height="Auto" />
                 <RowDefinition Height="*" />
             </Grid.RowDefinitions>
@@ -42,51 +43,53 @@
                 </interactivity:DataTriggerBehavior>
             </interactivity:Interaction.Behaviors>
 
-            <!--  播放源列表  -->
-            <ListView
-                x:Name="MediaSourceProvidersListView"
+            <InfoBar
                 Grid.Row="0"
-                AllowDrop="True"
-                CanDragItems="True"
-                CanReorderItems="True"
-                DragItemsCompleted="MediaSourceProvidersListView_DragItemsCompleted"
-                ItemsSource="{x:Bind ViewModel.AppSettings.MediaSourceProvidersInfo, Mode=OneWay}"
-                ScrollViewer.HorizontalScrollBarVisibility="Hidden"
-                ScrollViewer.HorizontalScrollMode="Enabled"
-                ScrollViewer.VerticalScrollBarVisibility="Disabled"
-                ScrollViewer.VerticalScrollMode="Disabled"
-                SelectedItem="{x:Bind ViewModel.SelectedMediaSourceProvider, Mode=TwoWay}">
-                <ListView.ItemsPanel>
-                    <ItemsPanelTemplate>
-                        <ItemsStackPanel Orientation="Horizontal" />
-                    </ItemsPanelTemplate>
-                </ListView.ItemsPanel>
-                <ListView.ItemTemplate>
-                    <DataTemplate x:DataType="models:MediaSourceProviderInfo">
-                        <StackPanel Orientation="Horizontal" Spacing="6">
-                            <ToolTipService.ToolTip>
-                                <ToolTip Content="{Binding Provider, Mode=OneWay}" />
-                            </ToolTipService.ToolTip>
-                            <FontIcon
-                                FontFamily="Segoe UI Symbol"
-                                FontSize="12"
-                                Glyph="&#x283F;" />
-                            <Grid
-                                Width="16"
-                                Height="16"
-                                CornerRadius="4">
-                                <ImageIcon Source="{Binding LogoPath}" />
-                            </Grid>
-                            <TextBlock
-                                MaxWidth="200"
-                                Text="{Binding DisplayName, Mode=OneWay}"
-                                TextWrapping="Wrap" />
-                        </StackPanel>
-                    </DataTemplate>
-                </ListView.ItemTemplate>
-            </ListView>
+                IsClosable="False"
+                IsOpen="{x:Bind ViewModel.AppSettings.MusicGallerySettings.LyricsWindowStatus.IsOpened, Mode=OneWay}"
+                Message="音乐库窗口已打开，将忽略对其他播放源的监听"
+                Severity="Informational" />
 
-            <ScrollViewer Grid.Row="1" Style="{StaticResource SettingsScrollViewerStyle}">
+            <!--  播放源列表  -->
+            <Grid Grid.Row="1" Margin="36,0,36,4">
+                <StackPanel Spacing="{StaticResource SettingsCardSpacing}">
+                    <TextBlock x:Uid="SettingsPageConfigPlaybackSource" Style="{StaticResource SettingsSectionHeaderTextBlockStyle}" />
+                    <ComboBox
+                        x:Name="MediaSourceProvidersListView"
+                        HorizontalAlignment="Stretch"
+                        ItemsSource="{x:Bind ViewModel.AppSettings.MediaSourceProvidersInfo, Mode=OneWay}"
+                        SelectedItem="{x:Bind ViewModel.SelectedMediaSourceProvider, Mode=TwoWay}">
+                        <ComboBox.ItemTemplate>
+                            <DataTemplate x:DataType="models:MediaSourceProviderInfo">
+                                <Grid Padding="2,4" ColumnSpacing="12">
+                                    <Grid.ColumnDefinitions>
+                                        <ColumnDefinition Width="Auto" />
+                                        <ColumnDefinition Width="*" />
+                                    </Grid.ColumnDefinitions>
+                                    <ToolTipService.ToolTip>
+                                        <ToolTip Content="{Binding Provider, Mode=OneWay}" />
+                                    </ToolTipService.ToolTip>
+                                    <Grid
+                                        Grid.Column="0"
+                                        Width="16"
+                                        Height="16"
+                                        CornerRadius="4">
+                                        <ImageIcon Source="{Binding LogoPath}" />
+                                    </Grid>
+                                    <TextBlock
+                                        Grid.Column="1"
+                                        VerticalAlignment="Center"
+                                        Text="{Binding DisplayName, Mode=OneWay}"
+                                        TextWrapping="Wrap" />
+                                </Grid>
+                            </DataTemplate>
+                        </ComboBox.ItemTemplate>
+                    </ComboBox>
+                </StackPanel>
+            </Grid>
+
+            <!--  播放源配置  -->
+            <ScrollViewer Grid.Row="2" Style="{StaticResource SettingsScrollViewerStyle}">
                 <Grid Style="{StaticResource SettingsGridStyle}">
                     <StackPanel Spacing="{StaticResource SettingsCardSpacing}">
 
@@ -269,6 +272,7 @@
 
         </Grid>
 
+        <!--  播放源空白占位  -->
         <StackPanel
             Grid.Column="0"
             HorizontalAlignment="Center"
@@ -294,6 +298,8 @@
                 HorizontalAlignment="Center"
                 Foreground="{ThemeResource TextFillColorSecondaryBrush}" />
         </StackPanel>
+
+        <!--  右侧杂项设置  -->
         <Grid Grid.Column="1">
             <ScrollViewer Style="{StaticResource SettingsScrollViewerStyle}">
                 <Grid Style="{StaticResource SettingsGridStyle}">
@@ -347,7 +353,8 @@
                                     Link="{x:Bind ViewModel.MediaSessionsService.CurrentLyricsSearchResult.Reference, Mode=OneWay}"
                                     ToolTipService.ToolTip="{x:Bind ViewModel.MediaSessionsService.CurrentLyricsSearchResult.Reference, TargetNullValue=N/A, Mode=OneWay}"
                                     Value="{x:Bind ViewModel.MediaSessionsService.CurrentLyricsSearchResult.ProviderIfFound, Mode=OneWay, Converter={StaticResource LyricsSearchProviderToDisplayNameConverter}}" />
-                                <local:PropertyRow x:Uid="LyricsPageTranslationProviderPrefix" Value="{x:Bind ViewModel.MediaSessionsService.TranslationSearchProvider, Mode=OneWay, Converter={StaticResource TranslationSearchProviderToDisplayNameConverter}}" />
+                                <local:PropertyRow x:Uid="LyricsPageTransliterationProviderPrefix" Value="{x:Bind ViewModel.MediaSessionsService.CurrentLyricsSearchResult.TransliterationProvider, Mode=OneWay, Converter={StaticResource TransliterationSearchProviderToDisplayNameConverter}}" />
+                                <local:PropertyRow x:Uid="LyricsPageTranslationProviderPrefix" Value="{x:Bind ViewModel.MediaSessionsService.CurrentLyricsSearchResult.TranslationProvider, Mode=OneWay, Converter={StaticResource TranslationSearchProviderToDisplayNameConverter}}" />
                                 <local:PropertyRow
                                     x:Uid="LyricsPageMatchPercentage"
                                     Unit="%"
@@ -359,6 +366,10 @@
                             </StackPanel>
                         </Expander>
 
+                        <dev:SettingsCard x:Uid="SettingsPageListenNewSession">
+                            <ToggleSwitch IsOn="{x:Bind ViewModel.AppSettings.GeneralSettings.ListenOnNewPlaybackSource, Mode=TwoWay}" />
+                        </dev:SettingsCard>
+
                         <dev:SettingsCard x:Uid="SettingsPageForceWordByWordEffect">
                             <ToggleSwitch IsOn="{x:Bind ViewModel.AppSettings.GeneralSettings.IsForceWordByWordEffect, Mode=TwoWay}" />
                         </dev:SettingsCard>
@@ -514,6 +525,7 @@
                 </Grid>
             </ScrollViewer>
         </Grid>
+
     </Grid>
 
 </UserControl>

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Controls/ShadowImage.xaml

@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<UserControl
+    x:Class="BetterLyrics.WinUI3.Controls.ShadowImage"
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:const="using:BetterLyrics.WinUI3.Constants"
+    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+    xmlns:local="using:BetterLyrics.WinUI3.Controls"
+    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    mc:Ignorable="d">
+    <UserControl.OpacityTransition>
+        <ScalarTransition />
+    </UserControl.OpacityTransition>
+
+    <Grid Margin="-32" Padding="32">
+        <Grid
+            x:Name="ShadowCastGrid"
+            HorizontalAlignment="Center"
+            VerticalAlignment="Center"
+            SizeChanged="ShadowCastGrid_SizeChanged">
+            <Image Source="{x:Bind Source, Mode=OneWay}" Stretch="Uniform" />
+        </Grid>
+        <Border
+            x:Name="ShadowRect"
+            Loaded="ShadowRect_Loaded"
+            SizeChanged="ShadowRect_SizeChanged"
+            Translation="0,0,0">
+            <Border.Shadow>
+                <ThemeShadow x:Name="Shadow" />
+            </Border.Shadow>
+        </Border>
+    </Grid>
+
+</UserControl>

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Controls/ShadowImage.xaml.cs

@@ -0,0 +1,93 @@
+using Microsoft.UI.Xaml;
+using Microsoft.UI.Xaml.Controls;
+using Microsoft.UI.Xaml.Media;
+using System;
+
+// To learn more about WinUI, the WinUI project structure,
+// and more about our project templates, see: http://aka.ms/winui-project-info.
+
+namespace BetterLyrics.WinUI3.Controls
+{
+    public sealed partial class ShadowImage : UserControl
+    {
+        public int CornerRadiusAmount
+        {
+            get { return (int)GetValue(CornerRadiusAmountProperty); }
+            set { SetValue(CornerRadiusAmountProperty, value); }
+        }
+
+        public static readonly DependencyProperty CornerRadiusAmountProperty =
+            DependencyProperty.Register(nameof(CornerRadiusAmount), typeof(int), typeof(ShadowImage), new PropertyMetadata(0, OnDependencyPropertyChanged));
+
+        public int ShadowAmount
+        {
+            get { return (int)GetValue(ShadowAmountProperty); }
+            set { SetValue(ShadowAmountProperty, value); }
+        }
+
+        public static readonly DependencyProperty ShadowAmountProperty =
+            DependencyProperty.Register(nameof(ShadowAmount), typeof(int), typeof(ShadowImage), new PropertyMetadata(0, OnDependencyPropertyChanged));
+
+        public ImageSource? Source
+        {
+            get { return (ImageSource?)GetValue(SourceProperty); }
+            set { SetValue(SourceProperty, value); }
+        }
+
+        public static readonly DependencyProperty SourceProperty =
+            DependencyProperty.Register(nameof(Source), typeof(ImageSource), typeof(ShadowImage), new PropertyMetadata(null));
+
+        public ShadowImage()
+        {
+            InitializeComponent();
+        }
+
+        private static void OnDependencyPropertyChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
+        {
+            if (d is ShadowImage shadowImage)
+            {
+                if (e.Property == CornerRadiusAmountProperty)
+                {
+                    shadowImage.UpdateShadowCastGridCornerRadius();
+                    shadowImage.UpdateShadowRectCornerRadius();
+                }
+                else if (e.Property == ShadowAmountProperty)
+                {
+                    shadowImage.UpdateShadowRectShadow();
+                }
+            }
+        }
+
+        private void UpdateShadowRectShadow()
+        {
+            ShadowRect.Translation = new(0, 0, ShadowAmount);
+        }
+
+        private void UpdateShadowCastGridCornerRadius()
+        {
+            var minSize = Math.Min(ShadowCastGrid.ActualHeight, ShadowCastGrid.ActualWidth);
+            ShadowCastGrid.CornerRadius = new(CornerRadiusAmount / 100.0 * (minSize / 2));
+        }
+
+        private void UpdateShadowRectCornerRadius()
+        {
+            var minSize = Math.Min(ShadowRect.ActualHeight, ShadowRect.ActualWidth);
+            ShadowRect.CornerRadius = new(CornerRadiusAmount / 100.0 * (minSize / 2));
+        }
+
+        private void ShadowCastGrid_SizeChanged(object sender, SizeChangedEventArgs e)
+        {
+            UpdateShadowCastGridCornerRadius();
+        }
+
+        private void ShadowRect_SizeChanged(object sender, SizeChangedEventArgs e)
+        {
+            UpdateShadowRectCornerRadius();
+        }
+
+        private void ShadowRect_Loaded(object sender, RoutedEventArgs e)
+        {
+            Shadow.Receivers.Add(ShadowCastGrid);
+        }
+    }
+}

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Controls/SystemTray.xaml

@@ -14,9 +14,9 @@
         x:Name="TrayIcon"
         x:FieldModifier="public"
         ContextMenuMode="SecondWindow"
-        DoubleClickCommand="{x:Bind ViewModel.OpenLyricsCommand}"
+        DoubleClickCommand="{x:Bind ViewModel.OpenLyricsWindowSwitchCommand}"
         IconSource="ms-appx:///Assets/Logo.ico"
-        LeftClickCommand="{x:Bind ViewModel.OpenLyricsCommand}"
+        LeftClickCommand="{x:Bind ViewModel.OpenLyricsWindowSwitchCommand}"
         NoLeftClickDelay="True"
         ToolTipText="{x:Bind ViewModel.ToolTipText, Mode=OneWay}">
         <tb:TaskbarIcon.ContextFlyout>
@@ -39,11 +39,6 @@
                     Command="{x:Bind ViewModel.OpenLyricsSearchWindowCommand}"
                     Icon="{ui:FontIcon FontFamily={StaticResource IconFontFamily},
                                        Glyph=&#xE721;}" />
-                <MenuFlyoutItem
-                    x:Uid="SystemTrayLyrics"
-                    Command="{x:Bind ViewModel.OpenLyricsCommand}"
-                    Icon="{ui:FontIcon FontFamily={StaticResource IconFontFamily},
-                                       Glyph=&#xE90B;}" />
                 <MenuFlyoutItem
                     x:Uid="SystemTrayMusicGallery"
                     Command="{x:Bind ViewModel.OpenMusicGalleryCommand}"

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Controls/WindowSettingsControl.xaml

@@ -0,0 +1,123 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<UserControl
+    x:Class="BetterLyrics.WinUI3.Controls.WindowSettingsControl"
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+    xmlns:dev="using:DevWinUI"
+    xmlns:local="using:BetterLyrics.WinUI3.Controls"
+    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    xmlns:ui="using:CommunityToolkit.WinUI"
+    mc:Ignorable="d">
+
+    <Grid>
+        <ScrollViewer Style="{StaticResource SettingsScrollViewerStyle}">
+            <Grid Style="{StaticResource SettingsGridStyle}">
+                <StackPanel Spacing="{StaticResource SettingsCardSpacing}">
+
+                    <TextBlock x:Uid="AppSettingsControlGeneral" Style="{StaticResource SettingsSectionHeaderTextBlockStyle}" />
+
+                    <dev:SettingsCard x:Uid="SettingsPageConfigName" HeaderIcon="{ui:FontIcon FontFamily={StaticResource IconFontFamily}, Glyph=&#xE8AC;}">
+                        <StackPanel
+                            Margin="0,6,0,0"
+                            Orientation="Horizontal"
+                            Spacing="6">
+                            <TextBox Text="{x:Bind LyricsWindowStatus.Name, Mode=TwoWay}" TextWrapping="Wrap" />
+                            <Button Content="{ui:FontIcon FontFamily={StaticResource IconFontFamily}, FontSize=12, Glyph=&#xE8FB;}" Style="{StaticResource GhostButtonStyle}" />
+                        </StackPanel>
+                    </dev:SettingsCard>
+
+                    <dev:SettingsExpander
+                        x:Uid="SettingsPageWorkArea"
+                        HeaderIcon="{ui:FontIcon FontFamily={StaticResource IconFontFamily},
+                                                 Glyph=&#xE78B;}"
+                        IsExpanded="{x:Bind LyricsWindowStatus.IsWorkArea, Mode=OneWay}">
+                        <ToggleSwitch IsOn="{x:Bind LyricsWindowStatus.IsWorkArea, Mode=TwoWay}" />
+                        <dev:SettingsExpander.Items>
+                            <dev:SettingsCard x:Uid="SettingsPageWorkAreaHeight" IsEnabled="{x:Bind LyricsWindowStatus.IsWorkArea, Mode=OneWay}">
+                                <local:ExtendedSlider
+                                    Default="64"
+                                    Maximum="{x:Bind LyricsWindowStatus.MonitorBounds.Height, Mode=OneWay}"
+                                    Minimum="64"
+                                    Unit="px"
+                                    Value="{x:Bind LyricsWindowStatus.DockHeight, Mode=TwoWay}" />
+                            </dev:SettingsCard>
+
+                            <dev:SettingsCard x:Uid="SettingsPageDockPlacement" IsEnabled="{x:Bind LyricsWindowStatus.IsWorkArea, Mode=OneWay}">
+                                <ComboBox SelectedIndex="{x:Bind LyricsWindowStatus.DockPlacement, Mode=TwoWay, Converter={StaticResource EnumToIntConverter}}">
+                                    <ComboBoxItem x:Uid="SettingsPageDockPlacementTop" />
+                                    <ComboBoxItem x:Uid="SettingsPageDockPlacementBottom" />
+                                </ComboBox>
+                            </dev:SettingsCard>
+
+                            <dev:SettingsCard x:Uid="SettingsPageDockMonitor" IsEnabled="{x:Bind LyricsWindowStatus.IsWorkArea, Mode=OneWay}">
+                                <StackPanel Orientation="Horizontal" Spacing="6">
+                                    <ComboBox ItemsSource="{x:Bind MonitorDeviceNames, Mode=OneWay}" SelectedItem="{x:Bind LyricsWindowStatus.MonitorDeviceName, Mode=TwoWay}" />
+                                    <Button
+                                        Click="RefreshMonitorButton_Click"
+                                        Content="{ui:FontIcon FontFamily={StaticResource IconFontFamily},
+                                                              FontSize=12,
+                                                              Glyph=&#xE72C;}"
+                                        Style="{StaticResource GhostButtonStyle}" />
+                                </StackPanel>
+                            </dev:SettingsCard>
+
+                        </dev:SettingsExpander.Items>
+                    </dev:SettingsExpander>
+
+                    <dev:SettingsExpander
+                        x:Uid="SettingsPageAdaptEnvColor"
+                        HeaderIcon="{ui:FontIcon FontFamily={StaticResource IconFontFamily},
+                                                 Glyph=&#xE88F;}"
+                        IsExpanded="{x:Bind LyricsWindowStatus.IsAdaptToEnvironment, Mode=OneWay}">
+                        <ToggleSwitch IsOn="{x:Bind LyricsWindowStatus.IsAdaptToEnvironment, Mode=TwoWay}" />
+                        <dev:SettingsExpander.Items>
+                            <dev:SettingsCard
+                                x:Uid="SettingsPageEnvColorSample"
+                                Header="Environment color sample mode"
+                                IsEnabled="{x:Bind LyricsWindowStatus.IsAdaptToEnvironment, Mode=OneWay}">
+                                <ComboBox SelectedIndex="{x:Bind LyricsWindowStatus.EnvironmentSampleMode, Mode=TwoWay, Converter={StaticResource EnumToIntConverter}}">
+                                    <ComboBoxItem x:Uid="SettingsPageEnvColorSampleBelow" />
+                                    <ComboBoxItem x:Uid="SettingsPageEnvColorSampleAbove" />
+                                    <ComboBoxItem x:Uid="SettingsPageEnvColorSampleInner" />
+                                    <ComboBoxItem x:Uid="SettingsPageEnvColorSampleEdge" />
+                                </ComboBox>
+                            </dev:SettingsCard>
+                        </dev:SettingsExpander.Items>
+                    </dev:SettingsExpander>
+
+                    <dev:SettingsExpander
+                        x:Uid="SettingsPageAOT"
+                        HeaderIcon="{ui:FontIcon FontFamily={StaticResource IconFontFamily},
+                                                 Glyph=&#xE718;}"
+                        IsExpanded="True">
+                        <ToggleSwitch IsOn="{x:Bind LyricsWindowStatus.IsAlwaysOnTop, Mode=TwoWay}" />
+                        <dev:SettingsExpander.Items>
+                            <dev:SettingsCard x:Uid="SettingsPageForceAlwaysOnTop" IsEnabled="{x:Bind LyricsWindowStatus.IsAlwaysOnTop, Mode=OneWay}">
+                                <ToggleSwitch IsOn="{x:Bind LyricsWindowStatus.IsAlwaysOnTopPolling, Mode=TwoWay}" />
+                            </dev:SettingsCard>
+                        </dev:SettingsExpander.Items>
+                    </dev:SettingsExpander>
+
+                    <dev:SettingsCard x:Uid="SettingsPageHideWindow" HeaderIcon="{ui:FontIcon FontFamily={StaticResource IconFontFamily}, Glyph=&#xED1A;}">
+                        <ToggleSwitch IsOn="{x:Bind LyricsWindowStatus.AutoShowOrHideWindow, Mode=TwoWay}" />
+                    </dev:SettingsCard>
+
+                    <dev:SettingsCard x:Uid="SettingsPageShowInSwitchers" HeaderIcon="{ui:FontIcon FontFamily={StaticResource IconFontFamily}, Glyph=&#xE7C4;}">
+                        <ToggleSwitch IsOn="{x:Bind LyricsWindowStatus.IsShownInSwitchers, Mode=TwoWay}" />
+                    </dev:SettingsCard>
+
+                    <dev:SettingsCard x:Uid="SettingsPageDragArea" HeaderIcon="{ui:FontIcon FontFamily={StaticResource IconFontFamily}, Glyph=&#xEB41;}">
+                        <ComboBox SelectedIndex="{x:Bind LyricsWindowStatus.TitleBarArea, Mode=TwoWay, Converter={StaticResource EnumToIntConverter}}">
+                            <ComboBoxItem x:Uid="SettingsPageTitleBarAreaNone" />
+                            <ComboBoxItem x:Uid="SettingsPageTitleBarAreaTop" />
+                            <ComboBoxItem x:Uid="SettingsPageTitleBarAreaWhole" />
+                        </ComboBox>
+                    </dev:SettingsCard>
+
+                </StackPanel>
+            </Grid>
+        </ScrollViewer>
+
+    </Grid>
+</UserControl>

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Controls/WindowSettingsControl.xaml.cs

@@ -0,0 +1,43 @@
+using BetterLyrics.WinUI3.Hooks;
+using BetterLyrics.WinUI3.Models;
+using BetterLyrics.WinUI3.Models.Settings;
+using Microsoft.UI.Xaml;
+using Microsoft.UI.Xaml.Controls;
+using System.Collections.ObjectModel;
+using System.Linq;
+
+// To learn more about WinUI, the WinUI project structure,
+// and more about our project templates, see: http://aka.ms/winui-project-info.
+
+namespace BetterLyrics.WinUI3.Controls;
+
+public sealed partial class WindowSettingsControl : UserControl
+{
+    public static readonly DependencyProperty LyricsWindowStatusProperty =
+        DependencyProperty.Register(nameof(LyricsWindowStatus), typeof(AlbumArtAreaEffectSettings), typeof(WindowSettingsControl), new PropertyMetadata(default));
+
+    public LyricsWindowStatus LyricsWindowStatus
+    {
+        get => (LyricsWindowStatus)GetValue(LyricsWindowStatusProperty);
+        set => SetValue(LyricsWindowStatusProperty, value);
+    }
+
+    public ObservableCollection<string> MonitorDeviceNames { get; set; } = [];
+
+    public WindowSettingsControl()
+    {
+        InitializeComponent();
+        MonitorDeviceNames = [.. MonitorHook.GetAllMonitorDeviceNames()];
+    }
+
+    private void RefreshMonitorDeviceNames()
+    {
+        MonitorDeviceNames = [.. MonitorHook.GetAllMonitorDeviceNames()];
+        LyricsWindowStatus.MonitorDeviceName = MonitorDeviceNames.FirstOrDefault() ?? "";
+    }
+
+    private void RefreshMonitorButton_Click(object sender, RoutedEventArgs e)
+    {
+        RefreshMonitorDeviceNames();
+    }
+}

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Converter/TransliterationSearchProviderToDisplayNameConverter.cs

@@ -0,0 +1,41 @@
+using BetterLyrics.WinUI3.Enums;
+using BetterLyrics.WinUI3.Services.ResourceService;
+using CommunityToolkit.Mvvm.DependencyInjection;
+using Microsoft.UI.Xaml.Data;
+using System;
+
+namespace BetterLyrics.WinUI3.Converter
+{
+    public partial class TransliterationSearchProviderToDisplayNameConverter : IValueConverter
+    {
+        private readonly IResourceService _resourceService = Ioc.Default.GetRequiredService<IResourceService>();
+
+        public object Convert(object value, Type targetType, object parameter, string language)
+        {
+            if (value is TransliterationSearchProvider provider)
+            {
+                return provider switch
+                {
+                    TransliterationSearchProvider.LrcLib => "LrcLib",
+                    TransliterationSearchProvider.QQ => "QQ 音乐",
+                    TransliterationSearchProvider.Netease => "网易云音乐",
+                    TransliterationSearchProvider.Kugou => "酷狗音乐",
+                    TransliterationSearchProvider.AmllTtmlDb => "amll-ttml-db",
+                    TransliterationSearchProvider.AppleMusic => "Apple Music",
+                    TransliterationSearchProvider.LocalLrcFile => _resourceService.GetLocalizedString("LyricsSearchProviderLocalLrcFile"),
+                    TransliterationSearchProvider.LocalMusicFile => _resourceService.GetLocalizedString("LyricsSearchProviderLocalMusicFile"),
+                    TransliterationSearchProvider.LocalEslrcFile => _resourceService.GetLocalizedString("LyricsSearchProviderEslrcFile"),
+                    TransliterationSearchProvider.LocalTtmlFile => _resourceService.GetLocalizedString("LyricsSearchProviderTtmlFile"),
+                    TransliterationSearchProvider.BetterLyrics => "BetterLyrics",
+                    _ => "N/A",
+                };
+            }
+            return "N/A";
+        }
+
+        public object ConvertBack(object value, Type targetType, object parameter, string language)
+        {
+            throw new NotImplementedException();
+        }
+    }
+}

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Enums/ImageSwitchType.cs

@@ -0,0 +1,8 @@
+namespace BetterLyrics.WinUI3.Enums
+{
+    public enum ImageSwitchType
+    {
+        Crossfade,
+        Slide
+    }
+}

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Enums/LineMaskType.cs

@@ -1,8 +0,0 @@
-namespace BetterLyrics.WinUI3.Enums
-{
-    public enum LineMaskType
-    {
-        Glow,
-        Highlight,
-    }
-}

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Enums/LineRenderingType.cs

@@ -1,11 +0,0 @@
-// 2025/6/23 by Zhe Fang
-
-namespace BetterLyrics.WinUI3.Enums
-{
-    public enum LineRenderingType
-    {
-        CurrentChar,
-        LineStartToCurrentChar,
-        CurrentLine
-    }
-}

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Enums/LyricsEffectScope.cs

@@ -0,0 +1,8 @@
+namespace BetterLyrics.WinUI3.Enums
+{
+    public enum LyricsEffectScope
+    {
+        LongDurationSyllable,
+        LineStartToCurrentChar,
+    }
+}

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Enums/ShortcutID.cs

@@ -3,8 +3,6 @@
     public enum ShortcutID
     {
         LyricsWindowShowOrHide,
-        Borderless,
-        ClickThrough,
         LyricsWindowSwitch,
         PlayOrPauseSong,
         NextSong,

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Enums/TransliterationSearchProvider.cs

@@ -0,0 +1,17 @@
+namespace BetterLyrics.WinUI3.Enums
+{
+    public enum TransliterationSearchProvider
+    {
+        QQ,
+        Kugou,
+        Netease,
+        LrcLib,
+        AmllTtmlDb,
+        AppleMusic,
+        LocalMusicFile,
+        LocalLrcFile,
+        LocalEslrcFile,
+        LocalTtmlFile,
+        BetterLyrics
+    }
+}

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Events/InteractiveAreaEventArgs.cs

@@ -0,0 +1,16 @@
+using Microsoft.UI.Xaml;
+using System;
+using System.Collections.Generic;
+
+namespace BetterLyrics.WinUI3.Events
+{
+    public class InteractiveAreaEventArgs : EventArgs
+    {
+        public IList<FrameworkElement> Elements { get; set; }
+
+        public InteractiveAreaEventArgs(IList<FrameworkElement> elements)
+        {
+            Elements = elements;
+        }
+    }
+}

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Extensions/LyricsSearchProviderExtensions.cs

@@ -59,6 +59,21 @@ namespace BetterLyrics.WinUI3.Extensions
                 LyricsSearchProvider.LocalTtmlFile => TranslationSearchProvider.LocalTtmlFile,
                 _ => null,
             };
+
+            public TransliterationSearchProvider? ToTransliterationSearchProvider() => provider switch
+            {
+                LyricsSearchProvider.LrcLib => TransliterationSearchProvider.LrcLib,
+                LyricsSearchProvider.QQ => TransliterationSearchProvider.QQ,
+                LyricsSearchProvider.Kugou => TransliterationSearchProvider.Kugou,
+                LyricsSearchProvider.Netease => TransliterationSearchProvider.Netease,
+                LyricsSearchProvider.AmllTtmlDb => TransliterationSearchProvider.AmllTtmlDb,
+                LyricsSearchProvider.AppleMusic => TransliterationSearchProvider.AppleMusic,
+                LyricsSearchProvider.LocalMusicFile => TransliterationSearchProvider.LocalMusicFile,
+                LyricsSearchProvider.LocalLrcFile => TransliterationSearchProvider.LocalLrcFile,
+                LyricsSearchProvider.LocalEslrcFile => TransliterationSearchProvider.LocalEslrcFile,
+                LyricsSearchProvider.LocalTtmlFile => TransliterationSearchProvider.LocalTtmlFile,
+                _ => null,
+            };
         }
     }
 }

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Extensions/LyricsWindowStatusExtensions.cs

@@ -1,8 +1,11 @@
 using BetterLyrics.WinUI3.Enums;
+using BetterLyrics.WinUI3.Hooks;
 using BetterLyrics.WinUI3.Models;
 using BetterLyrics.WinUI3.Models.Settings;
 using BetterLyrics.WinUI3.Services.ResourceService;
+using BetterLyrics.WinUI3.Views;
 using CommunityToolkit.Mvvm.DependencyInjection;
+using Microsoft.UI.Xaml;
 using Windows.Foundation;
 
 namespace BetterLyrics.WinUI3.Extensions
@@ -11,17 +14,17 @@ namespace BetterLyrics.WinUI3.Extensions
     {
         private static readonly IResourceService _resourceService = Ioc.Default.GetRequiredService<IResourceService>();
 
-        public static LyricsWindowStatus DesktopMode()
+        public static LyricsWindowStatus DesktopMode(Window? window = null)
         {
-            return new LyricsWindowStatus
+            window ??= WindowHook.GetWindow<SystemTrayWindow>();
+            return new LyricsWindowStatus(window)
             {
                 Name = _resourceService.GetLocalizedString("DesktopMode"),
                 LyricsDisplayType = LyricsDisplayType.LyricsOnly,
                 WindowBounds = new Rect(100, 100, 600, 250),
                 IsAlwaysOnTop = true,
                 IsAlwaysOnTopPolling = true,
-                IsBorderless = true,
-                IsClickThrough = true,
+                IsLocked = true,
                 IsAdaptToEnvironment = true,
                 IsShownInSwitchers = false,
                 EnvironmentSampleMode = WindowPixelSampleMode.WindowEdge,
@@ -36,15 +39,15 @@ namespace BetterLyrics.WinUI3.Extensions
             };
         }
 
-        public static LyricsWindowStatus DockedMode()
+        public static LyricsWindowStatus DockedMode(Window? window = null)
         {
-            var status = new LyricsWindowStatus
+            window ??= WindowHook.GetWindow<SystemTrayWindow>();
+            var status = new LyricsWindowStatus(window)
             {
                 Name = _resourceService.GetLocalizedString("DockedMode"),
                 IsWorkArea = true,
                 IsAlwaysOnTop = true,
                 IsAlwaysOnTopPolling = true,
-                IsBorderless = true,
                 IsAdaptToEnvironment = true,
                 IsShownInSwitchers = false,
                 LyricsDisplayType = LyricsDisplayType.LyricsOnly,
@@ -64,19 +67,18 @@ namespace BetterLyrics.WinUI3.Extensions
             return status;
         }
 
-        public static LyricsWindowStatus FullscreenMode()
+        public static LyricsWindowStatus FullscreenMode(Window? window = null)
         {
-            var status = new LyricsWindowStatus
+            window ??= WindowHook.GetWindow<SystemTrayWindow>();
+            var status = new LyricsWindowStatus(window)
             {
                 Name = _resourceService.GetLocalizedString("FullscreenMode"),
-                IsBorderless = true,
-                IsAlwaysOnTop = true,
-                TitleBarArea = TitleBarArea.None,
                 LyricsLayoutOrientation = LyricsLayoutOrientation.Vertical,
                 LyricsStyleSettings = new LyricsStyleSettings
                 {
                     LyricsAlignmentType = TextAlignmentType.Center,
                 },
+                IsFullscreen = true,
             };
             status.WindowBounds = new Rect(
                 status.MonitorBounds.X,
@@ -87,17 +89,19 @@ namespace BetterLyrics.WinUI3.Extensions
             return status;
         }
 
-        public static LyricsWindowStatus StandardMode()
+        public static LyricsWindowStatus StandardMode(Window? window = null)
         {
-            return new LyricsWindowStatus
+            window ??= WindowHook.GetWindow<SystemTrayWindow>();
+            return new LyricsWindowStatus(window)
             {
                 Name = _resourceService.GetLocalizedString("StandardMode"),
             };
         }
 
-        public static LyricsWindowStatus NarrowMode()
+        public static LyricsWindowStatus NarrowMode(Window? window = null)
         {
-            return new LyricsWindowStatus
+            window ??= WindowHook.GetWindow<SystemTrayWindow>();
+            return new LyricsWindowStatus(window)
             {
                 Name = _resourceService.GetLocalizedString("NarrowMode"),
                 WindowBounds = new Rect(100, 100, 400, 800),

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Extensions/PointExtensions.cs

@@ -11,6 +11,9 @@ namespace BetterLyrics.WinUI3.Extensions
 
             public Point AddX(double deltaX) => new(point.X + deltaX, point.Y);
             public Point AddY(double deltaY) => new(point.X, point.Y + deltaY);
+
+            public Point WithX(double x) => new(x, point.Y);
+            public Point WithY(double y) => new(point.X, y);
         }
     }
 }

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Extensions/TrackExtensions.cs

@@ -26,6 +26,8 @@ namespace BetterLyrics.WinUI3.Extensions
                 }
                 return "";
             }
+
+            public string GetFileName() => Path.GetFileName(track.Path);
         }
     }
 }

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Helper/FontHelper.cs

@@ -1,6 +1,4 @@
 using Microsoft.Graphics.Canvas.Text;
-using Microsoft.UI.Xaml;
-using System;
 using System.Globalization;
 using System.Linq;
 using System.Windows.Markup;

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Helper/ImageHelper.cs

@@ -2,7 +2,6 @@
 
 using BetterLyrics.WinUI3.Enums;
 using Impressionist.Abstractions;
-using Microsoft.Graphics.Canvas;
 using System;
 using System.IO;
 using System.Linq;
@@ -53,42 +52,13 @@ namespace BetterLyrics.WinUI3.Helper
             return buffer;
         }
 
-        public static async Task<BitmapDecoder> MakeSquareWithThemeColor(IBuffer buffer, PaletteGeneratorType generatorType)
+        public static async Task<BitmapDecoder> GetBitmapDecoder(IBuffer buffer)
         {
             using var stream = new InMemoryRandomAccessStream();
             await stream.WriteAsync(buffer);
             var decoder = await BitmapDecoder.CreateAsync(stream);
 
-            if (decoder.PixelWidth == decoder.PixelHeight)
-            {
-                // 已经是正方形，直接返回
-                return decoder;
-            }
-
-            using var device = CanvasDevice.GetSharedDevice();
-            using var canvasBitmap = await CanvasBitmap.LoadAsync(device, stream);
-            var size = Math.Max(decoder.PixelWidth, decoder.PixelHeight);
-
-            var result = await GetAccentColorAsync(decoder, generatorType);
-            var color = Windows.UI.Color.FromArgb(255, (byte)result.Color.X, (byte)result.Color.Y, (byte)result.Color.Z);
-            using var renderTarget = new CanvasRenderTarget(device, size, size, 96);
-
-            int offsetX = (int)(size - decoder.PixelWidth) / 2;
-            int offsetY = (int)(size - decoder.PixelHeight) / 2;
-            using (var ds = renderTarget.CreateDrawingSession())
-            {
-                ds.FillRectangle(0, 0, size, size, color);
-                ds.DrawImage(canvasBitmap, offsetX, offsetY);
-            }
-
-            // 保存为 PNG 并转为 byte[]
-            stream.Seek(0);
-            stream.Size = 0;
-            await renderTarget.SaveAsync(stream, CanvasBitmapFileFormat.Png);
-            stream.Seek(0);
-            var newDecoder = await BitmapDecoder.CreateAsync(stream);
-            return newDecoder;
-
+            return decoder;
         }
 
         public static byte[] GenerateNoiseBGRA(int width, int height)

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Helper/OverlayInputHelper.cs

@@ -0,0 +1,124 @@
+using BetterLyrics.WinUI3.Events;
+using Microsoft.UI.Xaml;
+using System;
+using System.Collections.Generic;
+using Vanara.PInvoke;
+using Windows.Foundation;
+
+namespace BetterLyrics.WinUI3.Helper
+{
+    /// <summary>
+    /// 用于管理覆盖层窗口的鼠标交互区域检测
+    /// </summary>
+    public class OverlayInputHelper
+    {
+        private readonly Window _window;
+        private readonly IntPtr _hwnd;
+        private readonly DispatcherTimer _timer;
+        private readonly List<FrameworkElement> _interactiveControls = new();
+
+        private bool _wasOverControl = false;
+
+        public Action<InteractiveAreaEventArgs> OnInteractiveAreaEntered;
+        public Action<InteractiveAreaEventArgs> OnInteractiveAreaMoved;
+        public Action OnInteractiveAreaExited;
+
+        public OverlayInputHelper(Window window)
+        {
+            _window = window;
+            _hwnd = WinRT.Interop.WindowNative.GetWindowHandle(_window);
+
+            _timer = new DispatcherTimer();
+            _timer.Interval = TimeSpan.FromMilliseconds(50);
+            _timer.Tick += Timer_Tick;
+        }
+
+        public void Register(FrameworkElement element)
+        {
+            if (!_interactiveControls.Contains(element)) _interactiveControls.Add(element);
+        }
+
+        public void Unregister(FrameworkElement element)
+        {
+            if (_interactiveControls.Contains(element)) _interactiveControls.Remove(element);
+        }
+
+        public void Start()
+        {
+            _timer.Start();
+            OnInteractiveAreaExited?.Invoke();
+        }
+
+        public void Stop()
+        {
+            _timer.Stop();
+        }
+
+        private void Timer_Tick(object? sender, object e)
+        {
+            User32.GetCursorPos(out var mousePoint);
+
+            bool isOverAnyControl = false;
+
+            List<FrameworkElement> overlappedElements = new();
+
+            foreach (var control in _interactiveControls)
+            {
+                if (control.XamlRoot == null || !control.XamlRoot.IsHostVisible) continue;
+
+                var bounds = GetElementScreenBounds(control);
+
+                if (mousePoint.X >= bounds.X &&
+                    mousePoint.X <= (bounds.X + bounds.Width) &&
+                    mousePoint.Y >= bounds.Y &&
+                    mousePoint.Y <= (bounds.Y + bounds.Height))
+                {
+                    isOverAnyControl = true;
+                    overlappedElements.Add(control);
+                }
+            }
+
+            if (isOverAnyControl)
+            {
+                OnInteractiveAreaMoved?.Invoke(new InteractiveAreaEventArgs(overlappedElements));
+            }
+
+            if (isOverAnyControl != _wasOverControl)
+            {
+                if (isOverAnyControl)
+                {
+                    OnInteractiveAreaEntered?.Invoke(new InteractiveAreaEventArgs(overlappedElements));
+                }
+                else
+                {
+                    OnInteractiveAreaExited?.Invoke();
+                }
+
+                _wasOverControl = isOverAnyControl;
+            }
+        }
+
+        private Rect GetElementScreenBounds(FrameworkElement element)
+        {
+            try
+            {
+                var transform = element.TransformToVisual(null);
+                var topLeft = transform.TransformPoint(new Point(0, 0));
+                double dpiScale = element.XamlRoot.RasterizationScale;
+
+                int clientX = (int)(topLeft.X * dpiScale);
+                int clientY = (int)(topLeft.Y * dpiScale);
+
+                var point = new POINT { X = clientX, Y = clientY };
+                User32.ClientToScreen(_hwnd, ref point);
+
+                return new Rect(point.X, point.Y, element.ActualWidth * dpiScale, element.ActualHeight * dpiScale);
+            }
+            catch
+            {
+                return Rect.Empty;
+            }
+        }
+
+    }
+}

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Helper/PlayerIDHelper.cs

@@ -29,6 +29,8 @@ namespace BetterLyrics.WinUI3.Helper
 
         public static bool IsAppleMusic(string? id) => id is PlayerID.AppleMusic or PlayerID.AppleMusicAlternative;
 
+        public static bool IsBetterLyrics(string? id) => id is PlayerID.BetterLyrics or PlayerID.BetterLyricsDebug;
+
         public static string? GetDisplayName(string? id) => id switch
         {
             PlayerID.Spotify => PlayerName.Spotify,

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Hooks/ForegroundWindowHook.cs

@@ -66,7 +66,7 @@ namespace BetterLyrics.WinUI3.Hooks
 
             _hooks.Clear();
 
-            //_timer.Stop();
+            _timer.Stop();
         }
 
         private void Timer_Tick(object? sender, object e)

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Hooks/GlobalHotKeyHook.cs

@@ -1,4 +1,5 @@
 using BetterLyrics.WinUI3.Enums;
+using Microsoft.UI.Xaml;
 using System;
 using System.Collections.Generic;
 using Vanara.PInvoke;
@@ -19,13 +20,10 @@ namespace BetterLyrics.WinUI3.Hooks
         /// <param name="id"></param>
         /// <param name="keys"></param>
         /// <param name="action"></param>
-        private static void RegisterHotKey<T>(ShortcutID id, List<string> keys, Action action)
+        private static void RegisterHotKey(Window window, ShortcutID id, List<string> keys, Action action)
         {
             if (keys.Count == 0) return;
 
-            var window = WindowHook.GetWindow<T>();
-            if (window == null) return;
-
             HWND hwnd = WindowNative.GetWindowHandle(window);
             User32.HotKeyModifiers modifiers = User32.HotKeyModifiers.MOD_NONE;
             VirtualKey key = VirtualKey.None;
@@ -60,21 +58,18 @@ namespace BetterLyrics.WinUI3.Hooks
             }
         }
 
-        private static void UnregisterHotKey<T>(ShortcutID id)
+        private static void UnregisterHotKey(Window window, ShortcutID id)
         {
-            var window = WindowHook.GetWindow<T>();
-            if (window == null) return;
-
             HWND hwnd = WindowNative.GetWindowHandle(window);
             User32.UnregisterHotKey(hwnd, (int)id);
             _actions.Remove((int)id);
             _keys.Remove((int)id);
         }
 
-        public static void UpdateHotKey<T>(ShortcutID id, List<string> keys, Action action)
+        public static void UpdateHotKey(Window window, ShortcutID id, List<string> keys, Action action)
         {
-            UnregisterHotKey<T>(id);
-            RegisterHotKey<T>(id, keys, action);
+            UnregisterHotKey(window, id);
+            RegisterHotKey(window, id, keys, action);
         }
 
         public static bool IsHotKeyRegistered(ShortcutID id)

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Hooks/TaskbarHook.cs

@@ -0,0 +1,24 @@
+using Microsoft.UI.Xaml;
+using System;
+
+namespace BetterLyrics.WinUI3.Hooks
+{
+    public class TaskbarHook
+    {
+        private readonly DispatcherTimer _timer;
+
+        public Action<EventArgs> OnTaskbarBoundsChanged;
+
+        public TaskbarHook()
+        {
+            _timer = new DispatcherTimer();
+            _timer.Interval = TimeSpan.FromMilliseconds(50);
+            _timer.Tick += Timer_Tick;
+        }
+
+        private void Timer_Tick(object? sender, object e)
+        {
+        }
+
+    }
+}

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Hooks/WindowHook.cs

@@ -1,11 +1,8 @@
 // 2025/6/23 by Zhe Fang
 
 using BetterLyrics.WinUI3.Enums;
-using BetterLyrics.WinUI3.Helper;
-using BetterLyrics.WinUI3.Services.LiveStatesService;
-using BetterLyrics.WinUI3.Services.MediaSessionsService;
+using BetterLyrics.WinUI3.Models;
 using BetterLyrics.WinUI3.Views;
-using CommunityToolkit.Mvvm.DependencyInjection;
 using CommunityToolkit.WinUI;
 using Microsoft.UI.Dispatching;
 using Microsoft.UI.Windowing;
@@ -29,39 +26,28 @@ namespace BetterLyrics.WinUI3.Hooks
         private static readonly Dictionary<HWND, WindowStyle> _defaultWindowStyle = [];
         private static readonly Dictionary<HWND, ExtendedWindowStyle> _defaultExtendedWindowStyle = [];
 
-        private static readonly ILiveStatesService _liveStatesService = Ioc.Default.GetRequiredService<ILiveStatesService>();
-        private static readonly IMediaSessionsService _mediaSessionsService = Ioc.Default.GetRequiredService<IMediaSessionsService>();
-
-        private static DispatcherQueueTimer? _setLyricsWindowVisibilityByPlayingStatusTimer;
-
-        public static void HideWindow<T>()
+        public static void HideWindow(this Window window)
         {
-            var window = _activeWindows.Find(w => w is T);
-            var castedWindow = window as Window;
-            castedWindow?.Hide();
+            window.Hide();
         }
 
-        public static void CloseWindow<T>()
+        public static void CloseWindow(this Window window)
         {
-            if (typeof(T) == typeof(NowPlayingWindow))
+            if (window is NowPlayingWindow nowPlayingWindow)
             {
-                EnsureDockModeReleased();
-            }
-            var window = _activeWindows.Find(w => w is T);
-            if (window is Window w)
-            {
-                w.Close();
-                _activeWindows.Remove(w);
+                if (GetWindowHandle(window) is IntPtr hwnd)
+                {
+                    UnregisterWorkArea(hwnd);
+                }
+                nowPlayingWindow.LyricsWindowStatus.IsOpened = false;
             }
+            window.Close();
+            _activeWindows.Remove(window);
         }
 
-        public static void MinimizeWindow<T>()
+        public static void MinimizeWindow(this Window window)
         {
-            var window = _activeWindows.Find(w => w is T);
-            if (window is Window w)
-            {
-                w.Minimize();
-            }
+            window.Minimize();
         }
 
         public static T? GetWindow<T>()
@@ -76,6 +62,19 @@ namespace BetterLyrics.WinUI3.Hooks
             return default;
         }
 
+        public static List<T> GetWindows<T>()
+        {
+            var windows = new List<T>();
+            foreach (var window in _activeWindows)
+            {
+                if (window is T castedWindow)
+                {
+                    windows.Add(castedWindow);
+                }
+            }
+            return windows;
+        }
+
         public static IntPtr? GetWindowHandle(object? obj)
         {
             if (obj is FrameworkElement frameworkElement)
@@ -97,15 +96,22 @@ namespace BetterLyrics.WinUI3.Hooks
             return GetWindowHandle(GetWindow<T>());
         }
 
-        public static void OpenOrShowWindow<T>()
+        public static T OpenOrShowWindow<T>(LyricsWindowStatus? status = null)
         {
-            var window = _activeWindows.Find(w => w is T);
+            var window = _activeWindows.Find(w =>
+                (typeof(T) != typeof(NowPlayingWindow) && w is T) ||
+                (typeof(T) == typeof(NowPlayingWindow) && w is T && ((NowPlayingWindow)w).LyricsWindowStatus == status)
+            );
+
             if (window == null)
             {
                 if (typeof(T) == typeof(NowPlayingWindow))
                 {
-                    window = new NowPlayingWindow();
-                    ((NowPlayingWindow)window).SystemBackdrop = SystemBackdropHelper.CreateSystemBackdrop(BackdropType.Transparent);
+                    if (status == null)
+                    {
+                        throw new NullReferenceException(nameof(status));
+                    }
+                    window = new NowPlayingWindow(status);
                 }
                 else if (typeof(T) == typeof(SettingsWindow))
                 {
@@ -123,6 +129,10 @@ namespace BetterLyrics.WinUI3.Hooks
                 {
                     window = new LyricsWindowSwitchWindow();
                 }
+                else if (typeof(T) == typeof(SystemTrayWindow))
+                {
+                    window = new SystemTrayWindow();
+                }
                 else
                 {
                     throw new ArgumentException("Unsupported window type", nameof(T));
@@ -130,33 +140,22 @@ namespace BetterLyrics.WinUI3.Hooks
 
                 TrackWindow(window);
                 var castedWindow = (Window)window;
-                castedWindow.Restore();
-                castedWindow.Activate();
+
+                if (typeof(T) != typeof(SystemTrayWindow))
+                {
+                    castedWindow.Restore();
+                    castedWindow.Activate();
+                }
 
                 if (typeof(T) == typeof(NowPlayingWindow))
                 {
-                    _liveStatesService.InitLyricsWindowStatus();
-
                     var hwnd = WindowNative.GetWindowHandle(castedWindow);
                     _defaultWindowStyle.Add(hwnd, castedWindow.GetWindowStyle());
                     _defaultExtendedWindowStyle.Add(hwnd, castedWindow.GetExtendedWindowStyle());
 
                     var lyricsWindow = (NowPlayingWindow)window;
-                    lyricsWindow.ViewModel.InitShortcuts();
-                    lyricsWindow.ViewModel.InitFgWindowWatcher();
-
-                    _mediaSessionsService.InitPlaybackShortcuts();
-
-                    //TaskbarList.ThumbBarAddButtons(hwnd,
-                    //    [
-                    //        new Shell32.THUMBBUTTON()
-                    //        {
-                    //            szTip = "Previous",
-                    //            dwFlags = Shell32.THUMBBUTTONFLAGS.THBF_ENABLED,
-                    //            dwMask = Shell32.THUMBBUTTONMASK.THB_TOOLTIP | Shell32.THUMBBUTTONMASK.THB_FLAGS,
-                    //        }
-                    //    ]
-                    //);
+                    lyricsWindow.InitStatus();
+                    lyricsWindow.InitFgWindowWatcher();
                 }
             }
             else
@@ -165,6 +164,13 @@ namespace BetterLyrics.WinUI3.Hooks
                 castedWindow.Activate();
                 castedWindow.AppWindow.MoveInZOrderAtTop();
             }
+
+            if (typeof(T) == typeof(NowPlayingWindow))
+            {
+                ((NowPlayingWindow)window).LyricsWindowStatus.IsOpened = true;
+            }
+
+            return (T)window;
         }
 
         public static void RestartApp(string args = "")
@@ -189,13 +195,19 @@ namespace BetterLyrics.WinUI3.Hooks
 
         public static void ExitApp()
         {
-            EnsureDockModeReleased();
+            EnsureAllWorkAreasReleased();
             Environment.Exit(0);
         }
 
-        private static void EnsureDockModeReleased()
+        private static void EnsureAllWorkAreasReleased()
         {
-            SetIsWorkArea<NowPlayingWindow>(false);
+            foreach (var item in _workAreas)
+            {
+                if (GetWindowHandle(item) is IntPtr hwnd)
+                {
+                    UnregisterWorkArea(hwnd);
+                }
+            }
         }
 
         private static void TrackWindow(object window)
@@ -220,33 +232,15 @@ namespace BetterLyrics.WinUI3.Hooks
             }
         }
 
-        public static void SetIsClickThrough<T>(bool enable)
+        public static void SetIsWorkArea(this NowPlayingWindow window, bool enable)
         {
-            Window? window = GetWindow<T>() as Window;
             if (window == null) return;
 
             IntPtr hwnd = WindowNative.GetWindowHandle(window);
 
             if (enable)
             {
-                window.SetExtendedWindowStyle(_defaultExtendedWindowStyle[hwnd] | ExtendedWindowStyle.Transparent | ExtendedWindowStyle.Layered);
-            }
-            else
-            {
-                window.SetExtendedWindowStyle(_defaultExtendedWindowStyle[hwnd]);
-            }
-        }
-
-        public static void SetIsWorkArea<T>(bool enable)
-        {
-            Window? window = GetWindow<T>() as Window;
-            if (window == null) return;
-
-            IntPtr hwnd = WindowNative.GetWindowHandle(window);
-
-            if (enable)
-            {
-                RegisterWorkArea(hwnd);
+                RegisterWorkArea(hwnd, window.LyricsWindowStatus);
             }
             else
             {
@@ -254,35 +248,82 @@ namespace BetterLyrics.WinUI3.Hooks
             }
         }
 
-        public static void SetIsBorderless<T>(bool enable)
+        public static void SetIsLocked(this Window window, bool enable)
         {
-            var window = GetWindow<T>() as Window;
-            if (window == null) return;
+            SetIsBorderless(window, enable);
+            SetIsClickThrough(window, enable);
+        }
 
+        public static void SetIsClickThrough(this Window window, bool enable)
+        {
+            IntPtr hwnd = WindowNative.GetWindowHandle(window);
+
+            if (_defaultExtendedWindowStyle.TryGetValue(hwnd, out var style))
+            {
+                if (enable)
+                {
+                    window.SetExtendedWindowStyle(style | ExtendedWindowStyle.Layered | ExtendedWindowStyle.Transparent);
+                }
+                else
+                {
+                    window.SetExtendedWindowStyle(style);
+                }
+            }
+        }
+
+        public static void SetIsBorderless(this Window window, bool enable)
+        {
             var hwnd = WindowNative.GetWindowHandle(window);
 
+            if (_defaultWindowStyle.TryGetValue(hwnd, out var style))
+            {
+                if (enable)
+                {
+                    window.SetWindowStyle(WindowStyle.Popup | WindowStyle.Visible);
+                }
+                else
+                {
+                    window.SetWindowStyle(style);
+                }
+            }
+        }
+
+        public static void SetIsFullscreen(this Window window, bool enable)
+        {
+            if (window.AppWindow == null) return;
+
             if (enable)
             {
-                window.SetWindowStyle(WindowStyle.Popup | WindowStyle.Visible);
+                window.AppWindow.SetPresenter(AppWindowPresenterKind.FullScreen);
             }
             else
             {
-                window.SetWindowStyle(_defaultWindowStyle[hwnd]);
+                window.AppWindow.SetPresenter(AppWindowPresenterKind.Overlapped);
             }
         }
 
-        public static void SetIsShowInSwitchers<T>(bool enable)
+        public static void SetIsMaximized(this Window window, bool enable)
         {
-            var window = GetWindow<T>() as Window;
-            if (window == null) return;
+            if (window.AppWindow == null) return;
 
+            if (enable)
+            {
+                window.Maximize();
+            }
+            else
+            {
+                window.Restore();
+            }
+        }
+
+        public static void SetIsShowInSwitchers(this Window window, bool enable)
+        {
             window.AppWindow.IsShownInSwitchers = enable;
         }
 
-        public static void SetIsAlwaysOnTop<T>(bool enable)
+        public static void SetIsAlwaysOnTop(this Window window, bool enable)
         {
-            var window = GetWindow<T>() as Window;
-            if (window == null) return;
+            if (window.AppWindow == null) return;
 
             if (window.AppWindow.Presenter is OverlappedPresenter presenter)
             {
@@ -290,36 +331,25 @@ namespace BetterLyrics.WinUI3.Hooks
             }
         }
 
-        public static void MoveAndResize<T>(Rect rect)
+        public static void MoveAndResize(this Window window, Rect rect)
         {
-            var window = GetWindow<T>() as Window;
-            if (window == null) return;
-
             window.AppWindow.Move(new Windows.Graphics.PointInt32((int)rect.X, (int)rect.Y));
             window.AppWindow.Resize(new Windows.Graphics.SizeInt32((int)rect.Width, (int)rect.Height));
         }
 
-        public static void SetTitleBarArea<T>(TitleBarArea titleBarArea)
+        public static void SetTitleBarArea(this NowPlayingWindow window, TitleBarArea titleBarArea)
         {
-            if (typeof(T) == typeof(NowPlayingWindow))
-            {
-                NowPlayingWindow? lyricsWindow = GetWindow<NowPlayingWindow>();
-                lyricsWindow?.SetTitleBarArea(titleBarArea);
-            }
-            else
-            {
-                throw new Exception($"Unsupported window type: {typeof(T).FullName}");
-            }
+            window.SetTitleBarArea(titleBarArea);
         }
 
-        private static void RegisterWorkArea(IntPtr hwnd)
+        private static void RegisterWorkArea(IntPtr hwnd, LyricsWindowStatus status)
         {
             if (_workAreas.Contains(hwnd)) return;
 
-            var uEdge = _liveStatesService.LiveStates.LyricsWindowStatus.DockPlacement == DockPlacement.Top ? Shell32.ABE.ABE_TOP : Shell32.ABE.ABE_BOTTOM;
+            var uEdge = status.DockPlacement == DockPlacement.Top ? Shell32.ABE.ABE_TOP : Shell32.ABE.ABE_BOTTOM;
 
-            double top = _liveStatesService.LiveStates.LyricsWindowStatus.DockPlacement == DockPlacement.Top ? _liveStatesService.LiveStates.LyricsWindowStatus.MonitorBounds.Top : _liveStatesService.LiveStates.LyricsWindowStatus.MonitorBounds.Bottom - _liveStatesService.LiveStates.LyricsWindowStatus.DockHeight;
-            double bottom = top + _liveStatesService.LiveStates.LyricsWindowStatus.DockHeight;
+            double top = status.DockPlacement == DockPlacement.Top ? status.MonitorBounds.Top : status.MonitorBounds.Bottom - status.DockHeight;
+            double bottom = top + status.DockHeight;
 
             Shell32.APPBARDATA abd = new()
             {
@@ -328,9 +358,9 @@ namespace BetterLyrics.WinUI3.Hooks
                 uEdge = uEdge,
                 rc = new RECT
                 {
-                    Left = (int)_liveStatesService.LiveStates.LyricsWindowStatus.MonitorBounds.Left,
+                    Left = (int)status.MonitorBounds.Left,
                     Top = (int)top,
-                    Right = (int)_liveStatesService.LiveStates.LyricsWindowStatus.MonitorBounds.Right,
+                    Right = (int)status.MonitorBounds.Right,
                     Bottom = (int)bottom,
                 },
             };
@@ -358,23 +388,22 @@ namespace BetterLyrics.WinUI3.Hooks
             _workAreas.Remove(hwnd);
         }
 
-        public static void UpdateWorkArea<T>()
+        public static void UpdateWorkArea(this NowPlayingWindow window)
         {
-            var window = GetWindow<T>() as Window;
-            if (window == null) return;
-
             var hwnd = WindowNative.GetWindowHandle(window);
 
             if (!_workAreas.Contains(hwnd))
                 return;
 
-            var uEdge = _liveStatesService.LiveStates.LyricsWindowStatus.DockPlacement == DockPlacement.Top ? Shell32.ABE.ABE_TOP : Shell32.ABE.ABE_BOTTOM;
+            var status = window.LyricsWindowStatus;
 
-            double top = _liveStatesService.LiveStates.LyricsWindowStatus.DockPlacement == DockPlacement.Top ?
-                _liveStatesService.LiveStates.LyricsWindowStatus.MonitorBounds.Top :
-                _liveStatesService.LiveStates.LyricsWindowStatus.MonitorBounds.Bottom - _liveStatesService.LiveStates.LyricsWindowStatus.DockHeight;
+            var uEdge = status.DockPlacement == DockPlacement.Top ? Shell32.ABE.ABE_TOP : Shell32.ABE.ABE_BOTTOM;
 
-            double bottom = top + _liveStatesService.LiveStates.LyricsWindowStatus.DockHeight;
+            double top = status.DockPlacement == DockPlacement.Top ?
+                status.MonitorBounds.Top :
+                status.MonitorBounds.Bottom - status.DockHeight;
+
+            double bottom = top + status.DockHeight;
 
             Shell32.APPBARDATA abd = new()
             {
@@ -383,9 +412,9 @@ namespace BetterLyrics.WinUI3.Hooks
                 uEdge = uEdge,
                 rc = new RECT
                 {
-                    Left = (int)_liveStatesService.LiveStates.LyricsWindowStatus.MonitorBounds.Left,
+                    Left = (int)status.MonitorBounds.Left,
                     Top = (int)top,
-                    Right = (int)_liveStatesService.LiveStates.LyricsWindowStatus.MonitorBounds.Right,
+                    Right = (int)status.MonitorBounds.Right,
                     Bottom = (int)bottom,
                 },
             };
@@ -398,37 +427,32 @@ namespace BetterLyrics.WinUI3.Hooks
         /// 
         /// </summary>
         /// <param name="dispatcherQueue">请确保此参数指向同一个对象，建议传值 BaseViewModel._dispatcherQueue</param>
-        public static void SetLyricsWindowVisibilityByPlayingStatus(DispatcherQueue dispatcherQueue)
+        public static void SetLyricsWindowVisibilityByPlayingStatus(this NowPlayingWindow window, bool isPlaying, DispatcherQueue dispatcherQueue)
         {
-            _setLyricsWindowVisibilityByPlayingStatusTimer ??= dispatcherQueue.CreateTimer();
+            var status = window.LyricsWindowStatus;
 
-            _setLyricsWindowVisibilityByPlayingStatusTimer.Debounce(() =>
+            status.VisibilityTimer ??= dispatcherQueue.CreateTimer();
+
+            status.VisibilityTimer.Debounce(() =>
             {
-                var window = GetWindow<NowPlayingWindow>();
-                if (window == null) return;
-
-                if (_liveStatesService.LiveStates.LyricsWindowStatus.AutoShowOrHideWindow && !_mediaSessionsService.CurrentIsPlaying)
+                if (status.AutoShowOrHideWindow && !isPlaying)
                 {
-                    if (_liveStatesService.LiveStates.LyricsWindowStatus.IsWorkArea)
+                    if (status.IsWorkArea)
                     {
-                        _liveStatesService.LiveStates.IsLyricsWindowStatusRefreshing = true;
-                        SetIsWorkArea<NowPlayingWindow>(false);
-                        _liveStatesService.LiveStates.IsLyricsWindowStatusRefreshing = false;
+                        window.SetIsWorkArea(false);
                     }
-                    HideWindow<NowPlayingWindow>();
+                    window.HideWindow();
                 }
-                else if (_liveStatesService.LiveStates.LyricsWindowStatus.AutoShowOrHideWindow && _mediaSessionsService.CurrentIsPlaying)
+                else if (status.AutoShowOrHideWindow && isPlaying)
                 {
-                    if (_liveStatesService.LiveStates.LyricsWindowStatus.IsWorkArea)
+                    if (status.IsWorkArea)
                     {
-                        _liveStatesService.LiveStates.IsLyricsWindowStatusRefreshing = true;
-                        SetIsWorkArea<NowPlayingWindow>(true);
-                        _liveStatesService.LiveStates.IsLyricsWindowStatusRefreshing = false;
+                        window.SetIsWorkArea(true);
                     }
-                    OpenOrShowWindow<NowPlayingWindow>();
-                    if (_liveStatesService.LiveStates.LyricsWindowStatus.IsWorkArea)
+                    OpenOrShowWindow<NowPlayingWindow>(status);
+                    if (status.IsWorkArea)
                     {
-                        MoveAndResize<NowPlayingWindow>(_liveStatesService.LiveStates.LyricsWindowStatus.GetWindowBoundsWhenWorkArea());
+                        window.MoveAndResize(status.GetWindowBoundsWhenWorkArea());
                     }
                 }
             }, Constants.Time.DebounceTimeout);

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Logic/LyricsAnimator.cs

@@ -2,6 +2,7 @@
 using BetterLyrics.WinUI3.Models;
 using BetterLyrics.WinUI3.Models.Settings;
 using System;
+using System.Collections.Generic;
 using System.Linq;
 using Windows.UI;
 
@@ -13,12 +14,14 @@ namespace BetterLyrics.WinUI3.Logic
         private readonly double _highlightedScale = 1.0f;
 
         public void UpdateLines(
-            LyricsData? lyricsData,
+            IList<RenderLyricsLine>? lines,
             int startIndex,
             int endIndex,
             int playingLineIndex,
             double canvasHeight,
             double targetYScrollOffset,
+            double playingLineTopOffsetFactor,
+            LyricsStyleSettings lyricsStyle,
             LyricsEffectSettings lyricsEffect,
             ValueTransition<double> canvasYScrollTransition,
             Color bgColor,
@@ -30,14 +33,18 @@ namespace BetterLyrics.WinUI3.Logic
             bool isMouseScrollingChanged
         )
         {
-            if (lyricsData == null) return;
+            if (lines == null) return;
 
-            var currentPlayingLine = lyricsData.LyricsLines.ElementAtOrDefault(playingLineIndex);
+            var currentPlayingLine = lines.ElementAtOrDefault(playingLineIndex);
             if (currentPlayingLine == null) return;
 
+            var phoneticOpacity = lyricsStyle.PhoneticLyricsOpacity / 100.0;
+            var originalOpacity = lyricsStyle.OriginalLyricsOpacity / 100.0;
+            var translatedOpacity = lyricsStyle.TranslatedLyricsOpacity / 100.0;
+
             for (int i = startIndex; i <= endIndex + 1; i++)
             {
-                var line = lyricsData.LyricsLines.ElementAtOrDefault(i);
+                var line = lines.ElementAtOrDefault(i);
                 if (line == null) continue;
 
                 if (isLayoutChanged || isPlayingLineChanged || isMouseScrollingChanged)
@@ -45,7 +52,16 @@ namespace BetterLyrics.WinUI3.Logic
                     int lineCountDelta = i - playingLineIndex;
                     int absLineCountDelta = Math.Abs(lineCountDelta);
                     double distanceFromPlayingLine = Math.Abs(line.OriginalPosition.Y - currentPlayingLine.OriginalPosition.Y);
-                    double distanceFactor = Math.Clamp(distanceFromPlayingLine / (canvasHeight / 2), 0, 1);
+
+                    double distanceFactor = 0;
+                    if (lineCountDelta < 0)
+                    {
+                        distanceFactor = Math.Clamp(distanceFromPlayingLine / (canvasHeight * playingLineTopOffsetFactor), 0, 1);
+                    }
+                    else
+                    {
+                        distanceFactor = Math.Clamp(distanceFromPlayingLine / (canvasHeight * (1 - playingLineTopOffsetFactor)), 0, 1);
+                    }
 
                     double yScrollDuration;
                     double yScrollDelay;
@@ -72,7 +88,7 @@ namespace BetterLyrics.WinUI3.Logic
 
                     line.BlurAmountTransition.SetDuration(yScrollDuration);
                     line.BlurAmountTransition.SetDelay(yScrollDelay);
-                    line.BlurAmountTransition.StartTransition(isMouseScrolling ? 0 : (5 * distanceFactor));
+                    line.BlurAmountTransition.StartTransition(isMouseScrolling ? 0 : (lyricsEffect.IsLyricsBlurEffectEnabled ? (5 * distanceFactor) : 0));
 
                     line.ScaleTransition.SetDuration(yScrollDuration);
                     line.ScaleTransition.SetDelay(yScrollDelay);
@@ -80,19 +96,23 @@ namespace BetterLyrics.WinUI3.Logic
 
                     line.PhoneticOpacityTransition.SetDuration(yScrollDuration);
                     line.PhoneticOpacityTransition.SetDelay(yScrollDelay);
-                    line.PhoneticOpacityTransition.StartTransition(absLineCountDelta == 0 ? 0.6 : (isMouseScrolling ? 0.3 : (1 - distanceFactor) * 0.3));
+                    line.PhoneticOpacityTransition.StartTransition(
+                        absLineCountDelta == 0 ? phoneticOpacity : (isMouseScrolling ? phoneticOpacity : (1 - distanceFactor) * phoneticOpacity));
 
                     line.PlayedOriginalOpacityTransition.SetDuration(yScrollDuration);
                     line.PlayedOriginalOpacityTransition.SetDelay(yScrollDelay);
-                    line.PlayedOriginalOpacityTransition.StartTransition(absLineCountDelta == 0 ? 1 : (isMouseScrolling ? 0.3 : (1 - distanceFactor) * 0.3));
+                    line.PlayedOriginalOpacityTransition.StartTransition(
+                        absLineCountDelta == 0 ? 1 : (isMouseScrolling ? 1.0 : (1 - distanceFactor) * originalOpacity));
 
                     line.UnplayedOriginalOpacityTransition.SetDuration(yScrollDuration);
                     line.UnplayedOriginalOpacityTransition.SetDelay(yScrollDelay);
-                    line.UnplayedOriginalOpacityTransition.StartTransition(absLineCountDelta == 0 ? 0.3 : (isMouseScrolling ? 0.3 : (1 - distanceFactor) * 0.3));
+                    line.UnplayedOriginalOpacityTransition.StartTransition(
+                        absLineCountDelta == 0 ? originalOpacity : (isMouseScrolling ? originalOpacity : (1 - distanceFactor) * originalOpacity));
 
                     line.TranslatedOpacityTransition.SetDuration(yScrollDuration);
                     line.TranslatedOpacityTransition.SetDelay(yScrollDelay);
-                    line.TranslatedOpacityTransition.StartTransition(absLineCountDelta == 0 ? 0.6 : (isMouseScrolling ? 0.3 : (1 - distanceFactor) * 0.3));
+                    line.TranslatedOpacityTransition.StartTransition(
+                        absLineCountDelta == 0 ? translatedOpacity : (isMouseScrolling ? translatedOpacity : (1 - distanceFactor) * translatedOpacity));
 
                     line.ColorTransition.SetDuration(yScrollDuration);
                     line.ColorTransition.SetDelay(yScrollDelay);

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Logic/LyricsLayoutManager.cs

@@ -23,9 +23,9 @@ namespace BetterLyrics.WinUI3.Logic
         /// <param name="canvasHeight"></param>
         /// <param name="lyricsWidth"></param>
         /// <param name="lyricsHeight"></param>
-        public void MeasureAndArrange(
+        public static void MeasureAndArrange(
             ICanvasAnimatedControl resourceCreator,
-            LyricsData? lyricsData,
+            IList<RenderLyricsLine>? lines,
             LyricsWindowStatus status,
             AppSettings appSettings,
             double canvasWidth,
@@ -33,7 +33,7 @@ namespace BetterLyrics.WinUI3.Logic
             double lyricsWidth,
             double lyricsHeight)
         {
-            if (lyricsData == null || resourceCreator == null) return;
+            if (lines == null || resourceCreator == null) return;
 
             // 计算字体大小
             int originalFontSize, phoneticFontSize, translatedFontSize;
@@ -60,7 +60,7 @@ namespace BetterLyrics.WinUI3.Logic
             double currentY = 0;
             double actualWidth = 0;
 
-            foreach (var line in lyricsData.LyricsLines)
+            foreach (var line in lines)
             {
                 if (line == null) continue;
 
@@ -129,11 +129,10 @@ namespace BetterLyrics.WinUI3.Logic
         /// <summary>
         /// 计算为了让当前歌词行的竖直几何中心点对齐到 0（原点），画布应该移动的距离（从画布最初始状态计算的值）
         /// </summary>
-        public double? CalculateTargetScrollOffset(
-            LyricsData? lyricsData,
+        public static double? CalculateTargetScrollOffset(
+            IList<RenderLyricsLine>? lines,
             int playingLineIndex)
         {
-            var lines = lyricsData?.LyricsLines;
             if (lines == null || lines.Count == 0) return null;
 
             var currentLine = lines.ElementAtOrDefault(playingLineIndex);
@@ -141,27 +140,26 @@ namespace BetterLyrics.WinUI3.Logic
 
             if (currentLine?.OriginalCanvasTextLayout == null || firstLine == null) return null;
 
-            return -currentLine.OriginalPosition.Y
-                + firstLine.OriginalPosition.Y
-                - (currentLine.TranslatedPosition.Y
-                    + (currentLine.TranslatedCanvasTextLayout?.LayoutBounds.Height ?? 0)
-                    - currentLine.PhoneticPosition.Y) / 2.0;
+            return -currentLine.OriginalPosition.Y + firstLine.OriginalPosition.Y
+                - (currentLine.BottomRightPosition.Y - currentLine.TopLeftPosition.Y) / 2.0;
         }
 
         /// <summary>
         /// 计算当前屏幕可见的行范围
         /// 返回值: (StartVisibleIndex, EndVisibleIndex)
         /// </summary>
-        public (int Start, int End) CalculateVisibleRange(
-            IList<LyricsLine>? lines,
+        public static (int Start, int End) CalculateVisibleRange(
+            IList<RenderLyricsLine>? lines,
             double currentScrollOffset,
             double lyricsY,
             double lyricsHeight,
-            double canvasHeight)
+            double canvasHeight,
+            double playingLineTopOffsetFactor
+        )
         {
             if (lines == null || lines.Count == 0) return (-1, -1);
 
-            double offset = currentScrollOffset + lyricsY + lyricsHeight / 2;
+            double offset = currentScrollOffset + lyricsY + lyricsHeight * playingLineTopOffsetFactor;
 
             int start = FindFirstVisibleLine(lines, offset, lyricsY);
             int end = FindLastVisibleLine(lines, offset, lyricsY, lyricsHeight, canvasHeight);
@@ -175,34 +173,35 @@ namespace BetterLyrics.WinUI3.Logic
             return (start, end);
         }
 
-        public (int Start, int End) CalculateMaxRange(IList<LyricsLine>? lines)
+        public static (int Start, int End) CalculateMaxRange(IList<RenderLyricsLine>? lines)
         {
             if (lines == null || lines.Count == 0) return (-1, -1);
 
             return (0, lines.Count - 1);
         }
 
-        public double CalculateActualHeight(IList<LyricsLine>? lines)
+        public static double CalculateActualHeight(IList<RenderLyricsLine>? lines)
         {
             if (lines == null || lines.Count == 0) return 0;
 
             return lines.Last().BottomRightPosition.Y;
         }
 
-        public int FindMouseHoverLineIndex(
-            IList<LyricsLine>? lines,
+        public static int FindMouseHoverLineIndex(
+            IList<RenderLyricsLine>? lines,
             bool isMouseInLyricsArea,
             Point mousePosition,
             double currentScrollOffset,
             double lyricsY,
-            double lyricsHeight
+            double lyricsHeight,
+            double playingLineTopOffsetFactor
         )
         {
             if (!isMouseInLyricsArea) return -1;
 
             if (lines == null || lines.Count == 0) return -1;
 
-            double offset = currentScrollOffset + lyricsY + lyricsHeight / 2;
+            double offset = currentScrollOffset + lyricsY + lyricsHeight * playingLineTopOffsetFactor;
 
             int left = 0, right = lines.Count - 1, result = -1;
             while (left <= right)
@@ -217,7 +216,7 @@ namespace BetterLyrics.WinUI3.Logic
             return result;
         }
 
-        private int FindFirstVisibleLine(IList<LyricsLine> lines, double offset, double lyricsY)
+        private static int FindFirstVisibleLine(IList<RenderLyricsLine> lines, double offset, double lyricsY)
         {
             int left = 0, right = lines.Count - 1, result = -1;
             while (left <= right)
@@ -234,7 +233,7 @@ namespace BetterLyrics.WinUI3.Logic
             return result;
         }
 
-        private int FindLastVisibleLine(IList<LyricsLine> lines, double offset, double lyricsY, double lyricsHeight, double canvasHeight)
+        private static int FindLastVisibleLine(IList<RenderLyricsLine> lines, double offset, double lyricsY, double lyricsHeight, double canvasHeight)
         {
             int left = 0, right = lines.Count - 1, result = -1;
             while (left <= right)

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/LiveStates.cs

@@ -1,19 +0,0 @@
-using CommunityToolkit.Mvvm.ComponentModel;
-
-namespace BetterLyrics.WinUI3.Models
-{
-    public partial class LiveStates : ObservableRecipient
-    {
-        [ObservableProperty][NotifyPropertyChangedRecipients] public partial LyricsWindowStatus LyricsWindowStatus { get; set; }
-
-        /// <summary>
-        /// 在需要暂时禁用监听歌词窗口位置大小变化时使用
-        /// </summary>
-        public bool IsLyricsWindowStatusRefreshing { get; set; } = false;
-
-        public LiveStates()
-        {
-            LyricsWindowStatus = new LyricsWindowStatus();
-        }
-    }
-}

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/LyricsData.cs

@@ -19,7 +19,6 @@ namespace BetterLyrics.WinUI3.Models
         }
         public bool AutoGenerated { get; set; } = false;
         public string WrappedOriginalText => string.Join(StringHelper.NewLine, LyricsLines.Select(line => line.OriginalText));
-        public bool IsWordByWord => LyricsLines.Any(x => x.LyricsSyllables.Count != 0);
 
         public LyricsData()
         {
@@ -31,23 +30,7 @@ namespace BetterLyrics.WinUI3.Models
             LyricsLines = lyricsLines;
         }
 
-        public void ClearTranslatedText()
-        {
-            foreach (var line in LyricsLines)
-            {
-                line.TranslatedText = "";
-            }
-        }
-
-        public void ClearPhoneticText()
-        {
-            foreach (var line in LyricsLines)
-            {
-                line.PhoneticText = "";
-            }
-        }
-
-        public void SetTranslatedText(LyricsData translationData, int toleranceMs = 0)
+        public void SetTranslatedText(LyricsData translationData, int toleranceMs = 50)
         {
             foreach (var line in LyricsLines)
             {
@@ -68,7 +51,7 @@ namespace BetterLyrics.WinUI3.Models
             }
         }
 
-        public void SetPhoneticText(LyricsData phoneticData, int toleranceMs = 0)
+        public void SetPhoneticText(LyricsData phoneticData, int toleranceMs = 50)
         {
             foreach (var line in LyricsLines)
             {
@@ -107,30 +90,6 @@ namespace BetterLyrics.WinUI3.Models
             }
         }
 
-        public LyricsData CreateLyricsDataFrom(string translation)
-        {
-            var result = new LyricsData(LyricsLines.Select(line => new LyricsLine
-            {
-                StartMs = line.StartMs,
-                EndMs = line.EndMs,
-            }).ToList());
-            List<string> translationArr = translation.Split(StringHelper.NewLine).ToList();
-            int i = 0;
-            foreach (var line in result.LyricsLines)
-            {
-                if (i >= translationArr.Count)
-                {
-                    break;
-                }
-                else
-                {
-                    line.OriginalText = translationArr[i];
-                }
-                i++;
-            }
-            return result;
-        }
-
         public static LyricsData GetNotfoundPlaceholder()
         {
             return new LyricsData([new LyricsLine
@@ -141,16 +100,6 @@ namespace BetterLyrics.WinUI3.Models
             }]);
         }
 
-        public static LyricsData GetParseErrorPlaceholder()
-        {
-            return new LyricsData([new LyricsLine
-            {
-                StartMs = 0,
-                EndMs = (int)TimeSpan.FromMinutes(99).TotalMilliseconds,
-                OriginalText = _resourceService.GetLocalizedString("LyricsParseError"),
-            }]);
-        }
-
         public static LyricsData GetLoadingPlaceholder()
         {
             return new LyricsData([
@@ -175,5 +124,6 @@ namespace BetterLyrics.WinUI3.Models
             }
             return null;
         }
+
     }
 }

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/LyricsLine.cs

@@ -1,61 +1,11 @@
 // 2025/6/23 by Zhe Fang
 
-using BetterLyrics.WinUI3.Enums;
-using BetterLyrics.WinUI3.Extensions;
-using BetterLyrics.WinUI3.Helper;
-using Microsoft.Graphics.Canvas.Geometry;
-using Microsoft.Graphics.Canvas.Text;
-using Microsoft.Graphics.Canvas.UI.Xaml;
-using Microsoft.UI;
 using System.Collections.Generic;
-using System.Numerics;
-using Windows.UI;
 
 namespace BetterLyrics.WinUI3.Models
 {
     public class LyricsLine
     {
-        public double AnimationDuration { get; set; } = 0.3;
-        public ValueTransition<double> AngleTransition { get; set; }
-        public ValueTransition<double> BlurAmountTransition { get; set; }
-        public ValueTransition<double> PhoneticOpacityTransition { get; set; }
-        public ValueTransition<double> PlayedOriginalOpacityTransition { get; set; }
-        public ValueTransition<double> UnplayedOriginalOpacityTransition { get; set; }
-        public ValueTransition<double> TranslatedOpacityTransition { get; set; }
-        public ValueTransition<double> ScaleTransition { get; set; }
-        public ValueTransition<double> YOffsetTransition { get; set; }
-        public ValueTransition<Color> ColorTransition { get; set; }
-
-        public CanvasTextLayout? OriginalCanvasTextLayout { get; private set; }
-        public CanvasTextLayout? TranslatedCanvasTextLayout { get; private set; }
-        public CanvasTextLayout? PhoneticCanvasTextLayout { get; private set; }
-
-        /// <summary>
-        /// 原文坐标（相对于坐标原点）
-        /// </summary>
-        public Vector2 OriginalPosition { get; set; }
-        /// <summary>
-        /// 译文坐标（相对于坐标原点）
-        /// </summary>
-        public Vector2 TranslatedPosition { get; set; }
-        /// <summary>
-        /// 注音坐标（相对于坐标原点）
-        /// </summary>
-        public Vector2 PhoneticPosition { get; set; }
-
-        /// <summary>
-        /// 顶部坐标（相对于坐标原点）
-        /// </summary>
-        public Vector2 TopLeftPosition { get; set; }
-        /// <summary>
-        /// 中心坐标（相对于坐标原点）
-        /// </summary>
-        public Vector2 CenterPosition { get; private set; }
-        /// <summary>
-        /// 底部坐标（相对于坐标原点）
-        /// </summary>
-        public Vector2 BottomRightPosition { get; set; }
-
         public List<LyricsSyllable> LyricsSyllables { get; set; } = [];
 
         public int? DurationMs => EndMs - StartMs;
@@ -75,172 +25,5 @@ namespace BetterLyrics.WinUI3.Models
         /// </summary>
         public string PhoneticText { get; set; } = "";
 
-        public CanvasGeometry? OriginalCanvasGeometry { get; private set; }
-        public CanvasGeometry? TranslatedCanvasGeometry { get; private set; }
-        public CanvasGeometry? PhoneticCanvasGeometry { get; private set; }
-
-        public LyricsLine()
-        {
-            AngleTransition = new(
-                initialValue: 0,
-                durationSeconds: AnimationDuration,
-                easingType: EasingType.EaseInOutSine
-            );
-            BlurAmountTransition = new(
-                 initialValue: 0,
-                 durationSeconds: AnimationDuration,
-                 easingType: EasingType.EaseInOutSine
-             );
-            PhoneticOpacityTransition = new(
-                initialValue: 0,
-                durationSeconds: AnimationDuration,
-                easingType: EasingType.EaseInOutSine
-            );
-            PlayedOriginalOpacityTransition = new(
-                initialValue: 0,
-                durationSeconds: AnimationDuration,
-                easingType: EasingType.EaseInOutSine
-            );
-            UnplayedOriginalOpacityTransition = new(
-                initialValue: 0,
-                durationSeconds: AnimationDuration,
-                easingType: EasingType.EaseInOutSine
-            );
-            TranslatedOpacityTransition = new(
-                initialValue: 0,
-                durationSeconds: AnimationDuration,
-                easingType: EasingType.EaseInOutSine
-            );
-            ScaleTransition = new(
-                initialValue: 0,
-                durationSeconds: AnimationDuration,
-                easingType: EasingType.EaseInOutSine
-            );
-            YOffsetTransition = new(
-                initialValue: 0,
-                durationSeconds: AnimationDuration,
-                easingType: EasingType.EaseInOutSine
-            );
-            ColorTransition = new(
-                initialValue: Colors.Transparent,
-                durationSeconds: 0.3f,
-                interpolator: (from, to, progress) => Helper.ColorHelper.GetInterpolatedColor(progress, from, to)
-            );
-        }
-
-        public void UpdateCenterPosition(double maxWidth, TextAlignmentType type)
-        {
-            if (OriginalCanvasTextLayout == null)
-            {
-                return;
-            }
-
-            double centerY = (TopLeftPosition.Y + BottomRightPosition.Y) / 2;
-
-            CenterPosition = type switch
-            {
-                TextAlignmentType.Left => new Vector2(0, (float)centerY),
-                TextAlignmentType.Center => new Vector2((float)(0 + maxWidth / 2.0), (float)centerY),
-                TextAlignmentType.Right => new Vector2((float)(0 + maxWidth), (float)centerY),
-                _ => throw new System.ArgumentOutOfRangeException(nameof(type), type, null),
-            };
-        }
-
-        public void DisposeTextLayout()
-        {
-            PhoneticCanvasTextLayout?.Dispose();
-            PhoneticCanvasTextLayout = null;
-
-            OriginalCanvasTextLayout?.Dispose();
-            OriginalCanvasTextLayout = null;
-
-            TranslatedCanvasTextLayout?.Dispose();
-            TranslatedCanvasTextLayout = null;
-        }
-
-        public void RecreateTextLayout(
-            ICanvasAnimatedControl control,
-            bool createPhonetic, bool createTranslated,
-            int phoneticTextFontSize, int originalTextFontSize, int translatedTextFontSize,
-            LyricsFontWeight fontWeight,
-            string fontFamilyCJK, string fontFamilyWestern,
-            double maxWidth, double maxHeight, TextAlignmentType type)
-        {
-            DisposeTextLayout();
-
-            if (createPhonetic && PhoneticText != "")
-            {
-                PhoneticCanvasTextLayout = new CanvasTextLayout(control, PhoneticText, new CanvasTextFormat
-                {
-                    HorizontalAlignment = CanvasHorizontalAlignment.Left,
-                    VerticalAlignment = CanvasVerticalAlignment.Top,
-                    FontSize = phoneticTextFontSize,
-                    FontWeight = fontWeight.ToFontWeight(),
-                }, (float)maxWidth, (float)maxHeight)
-                {
-                    HorizontalAlignment = type.ToCanvasHorizontalAlignment(),
-                };
-                PhoneticCanvasTextLayout.SetFontFamily(PhoneticText, fontFamilyCJK, fontFamilyWestern);
-            }
-
-            OriginalCanvasTextLayout = new CanvasTextLayout(control, OriginalText, new CanvasTextFormat
-            {
-                HorizontalAlignment = CanvasHorizontalAlignment.Left,
-                VerticalAlignment = CanvasVerticalAlignment.Top,
-                FontSize = originalTextFontSize,
-                FontWeight = fontWeight.ToFontWeight(),
-            }, (float)maxWidth, (float)maxHeight)
-            {
-                HorizontalAlignment = type.ToCanvasHorizontalAlignment()
-            };
-            OriginalCanvasTextLayout.SetFontFamily(OriginalText, fontFamilyCJK, fontFamilyWestern);
-
-            if (createTranslated && TranslatedText != "")
-            {
-                TranslatedCanvasTextLayout = new CanvasTextLayout(control, TranslatedText, new CanvasTextFormat
-                {
-                    HorizontalAlignment = CanvasHorizontalAlignment.Left,
-                    VerticalAlignment = CanvasVerticalAlignment.Top,
-                    FontSize = translatedTextFontSize,
-                    FontWeight = fontWeight.ToFontWeight(),
-                }, (float)maxWidth, (float)maxHeight)
-                {
-                    HorizontalAlignment = type.ToCanvasHorizontalAlignment()
-                };
-                TranslatedCanvasTextLayout.SetFontFamily(TranslatedText, fontFamilyCJK, fontFamilyWestern);
-            }
-        }
-
-        public void DisposeTextGeometry()
-        {
-            PhoneticCanvasGeometry?.Dispose();
-            PhoneticCanvasGeometry = null;
-
-            OriginalCanvasGeometry?.Dispose();
-            OriginalCanvasGeometry = null;
-
-            TranslatedCanvasGeometry?.Dispose();
-            TranslatedCanvasGeometry = null;
-        }
-
-        public void RecreateTextGeometry()
-        {
-            DisposeTextGeometry();
-
-            if (PhoneticCanvasTextLayout != null)
-            {
-                PhoneticCanvasGeometry = CanvasGeometry.CreateText(PhoneticCanvasTextLayout);
-            }
-
-            if (OriginalCanvasTextLayout != null)
-            {
-                OriginalCanvasGeometry = CanvasGeometry.CreateText(OriginalCanvasTextLayout);
-            }
-
-            if (TranslatedCanvasTextLayout != null)
-            {
-                TranslatedCanvasGeometry = CanvasGeometry.CreateText(TranslatedCanvasTextLayout);
-            }
-        }
     }
 }

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/LyricsSearchProviderInfo.cs

@@ -10,7 +10,7 @@ namespace BetterLyrics.WinUI3.Models
         [ObservableProperty][NotifyPropertyChangedRecipients] public partial bool IsEnabled { get; set; }
         [ObservableProperty][NotifyPropertyChangedRecipients] public partial LyricsSearchProvider Provider { get; set; }
         [ObservableProperty][NotifyPropertyChangedRecipients] public partial bool IsMatchingThresholdOverwritten { get; set; } = false;
-        [ObservableProperty][NotifyPropertyChangedRecipients] public partial int MatchingThreshold { get; set; } = 0;
+        [ObservableProperty][NotifyPropertyChangedRecipients] public partial int MatchingThreshold { get; set; } = 40;
 
         public LyricsSearchProviderInfo() { }
 

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/LyricsSearchResult.cs

@@ -3,12 +3,15 @@ using BetterLyrics.WinUI3.Extensions;
 using CommunityToolkit.Mvvm.ComponentModel;
 using NTextCat.Commons;
 using System;
+using System.Text.Json.Serialization;
 
 namespace BetterLyrics.WinUI3.Models
 {
     public partial class LyricsSearchResult : ObservableObject, ICloneable
     {
         public LyricsSearchProvider Provider { get; set; }
+        [ObservableProperty] public partial TranslationSearchProvider? TranslationProvider { get; set; }
+        [ObservableProperty] public partial TransliterationSearchProvider? TransliterationProvider { get; set; }
 
         public string? Raw { get; set; }
 
@@ -31,11 +34,11 @@ namespace BetterLyrics.WinUI3.Models
 
         public string? SelfPath { get; set; }
 
-        public bool IsFound => !string.IsNullOrEmpty(Raw);
+        [JsonIgnore] public bool IsFound => !string.IsNullOrEmpty(Raw);
 
-        public LyricsSearchProvider? ProviderIfFound => IsFound ? Provider : null;
+        [JsonIgnore] public LyricsSearchProvider? ProviderIfFound => IsFound ? Provider : null;
 
-        public string? DisplayArtists => Artists?.Join("; ");
+        [JsonIgnore] public string? DisplayArtists => Artists?.Join("; ");
 
         public object Clone()
         {

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/LyricsWindowStatus.cs

@@ -3,7 +3,11 @@ using BetterLyrics.WinUI3.Hooks;
 using BetterLyrics.WinUI3.Models.Settings;
 using BetterLyrics.WinUI3.Views;
 using CommunityToolkit.Mvvm.ComponentModel;
+using Microsoft.UI.Dispatching;
+using Microsoft.UI.Xaml;
 using System;
+using System.Linq;
+using System.Text.Json.Serialization;
 using Windows.Foundation;
 
 namespace BetterLyrics.WinUI3.Models
@@ -14,11 +18,12 @@ namespace BetterLyrics.WinUI3.Models
         [ObservableProperty] public partial bool IsDefault { get; set; } = false;
         [ObservableProperty][NotifyPropertyChangedRecipients] public partial string MonitorDeviceName { get; set; } = string.Empty;
         [ObservableProperty][NotifyPropertyChangedRecipients] public partial bool IsWorkArea { get; set; } = false;
-        [ObservableProperty][NotifyPropertyChangedRecipients] public partial bool IsBorderless { get; set; } = false;
         [ObservableProperty][NotifyPropertyChangedRecipients] public partial bool IsAlwaysOnTop { get; set; } = false;
         [ObservableProperty][NotifyPropertyChangedRecipients] public partial bool IsAlwaysOnTopPolling { get; set; } = false;
         [ObservableProperty][NotifyPropertyChangedRecipients] public partial bool IsShownInSwitchers { get; set; } = true;
-        [ObservableProperty][NotifyPropertyChangedRecipients] public partial bool IsClickThrough { get; set; } = false;
+        [ObservableProperty][NotifyPropertyChangedRecipients] public partial bool IsLocked { get; set; } = false;
+        [ObservableProperty][NotifyPropertyChangedRecipients] public partial bool IsMaximized { get; set; } = false;
+        [ObservableProperty][NotifyPropertyChangedRecipients] public partial bool IsFullscreen { get; set; } = false;
         [ObservableProperty][NotifyPropertyChangedRecipients] public partial LyricsLayoutOrientation LyricsLayoutOrientation { get; set; } = LyricsLayoutOrientation.Horizontal;
         [ObservableProperty][NotifyPropertyChangedRecipients] public partial LyricsDisplayType LyricsDisplayType { get; set; } = LyricsDisplayType.SplitView;
         [ObservableProperty][NotifyPropertyChangedRecipients] public partial Rect WindowBounds { get; set; } = new Rect(100, 100, 800, 500);
@@ -30,83 +35,40 @@ namespace BetterLyrics.WinUI3.Models
         [ObservableProperty] public partial LyricsStyleSettings LyricsStyleSettings { get; set; } = new();
         [ObservableProperty] public partial LyricsEffectSettings LyricsEffectSettings { get; set; } = new(500, 500, 500, EasingType.EaseInOutQuad);
         [ObservableProperty][NotifyPropertyChangedRecipients] public partial LyricsBackgroundSettings LyricsBackgroundSettings { get; set; } = new();
-        [ObservableProperty][NotifyPropertyChangedRecipients] public partial AlbumArtLayoutSettings AlbumArtLayoutSettings { get; set; } = new();
+        [ObservableProperty][NotifyPropertyChangedRecipients] public partial AlbumArtAreaStyleSettings AlbumArtLayoutSettings { get; set; } = new();
+        [ObservableProperty] public partial AlbumArtAreaEffectSettings AlbumArtAreaEffectSettings { get; set; } = new();
         [ObservableProperty][NotifyPropertyChangedRecipients] public partial bool IsAdaptToEnvironment { get; set; } = false;
         [ObservableProperty][NotifyPropertyChangedRecipients] public partial WindowPixelSampleMode EnvironmentSampleMode { get; set; } = WindowPixelSampleMode.WindowEdge;
         [ObservableProperty][NotifyPropertyChangedRecipients] public partial bool AutoShowOrHideWindow { get; set; } = false;
         [ObservableProperty][NotifyPropertyChangedRecipients] public partial TitleBarArea TitleBarArea { get; set; } = TitleBarArea.Top;
 
-        [ObservableProperty][NotifyPropertyChangedRecipients] public partial double WindowX { get; set; } = 100;
-        [ObservableProperty][NotifyPropertyChangedRecipients] public partial double WindowY { get; set; } = 100;
-        [ObservableProperty][NotifyPropertyChangedRecipients] public partial double WindowWidth { get; set; } = 800;
-        [ObservableProperty][NotifyPropertyChangedRecipients] public partial double WindowHeight { get; set; } = 500;
+        [JsonIgnore][ObservableProperty][NotifyPropertyChangedRecipients] public partial bool IsOpened { get; set; } = false;
+
+        [JsonIgnore] public DispatcherQueueTimer? VisibilityTimer { get; set; }
 
         public LyricsWindowStatus()
         {
-            UpdateMonitorNameAndBounds();
+
+        }
+
+        public LyricsWindowStatus(Window? targetWindow = null)
+        {
+            UpdateMonitorNameAndBounds(targetWindow);
             UpdateDemoWindowAndMonitorBounds();
         }
 
-        partial void OnLyricsStyleSettingsChanged(LyricsStyleSettings oldValue, LyricsStyleSettings newValue)
-        {
-            oldValue.PropertyChanged -= OldLyricsStyleSettings_PropertyChanged;
-            newValue.PropertyChanged += OldLyricsStyleSettings_PropertyChanged;
-        }
-
-        partial void OnLyricsEffectSettingsChanged(LyricsEffectSettings oldValue, LyricsEffectSettings newValue)
-        {
-            oldValue.PropertyChanged -= OldLyricsEffectSettings_PropertyChanged;
-            newValue.PropertyChanged += OldLyricsEffectSettings_PropertyChanged;
-        }
-
-        partial void OnLyricsBackgroundSettingsChanged(LyricsBackgroundSettings oldValue, LyricsBackgroundSettings newValue)
-        {
-            oldValue.PropertyChanged -= OldLyricsBackgroundSettings_PropertyChanged;
-            newValue.PropertyChanged += OldLyricsBackgroundSettings_PropertyChanged;
-        }
-
-        partial void OnAlbumArtLayoutSettingsChanged(AlbumArtLayoutSettings oldValue, AlbumArtLayoutSettings newValue)
-        {
-            oldValue.PropertyChanged -= OldAlbumArtLayoutSettings_PropertyChanged;
-            newValue.PropertyChanged += OldAlbumArtLayoutSettings_PropertyChanged;
-        }
-
         partial void OnWindowBoundsChanged(Rect value)
         {
             UpdateMonitorNameAndBounds();
             UpdateDemoWindowAndMonitorBounds();
-            WindowX = WindowBounds.X;
-            WindowY = WindowBounds.Y;
-            WindowWidth = WindowBounds.Width;
-            WindowHeight = WindowBounds.Height;
         }
 
-        private void OldLyricsStyleSettings_PropertyChanged(object? sender, System.ComponentModel.PropertyChangedEventArgs e)
+        private void UpdateMonitorNameAndBounds(Window? targetWindow = null)
         {
-            this.OnPropertyChanged(nameof(LyricsStyleSettings));
-        }
+            targetWindow ??= WindowHook.GetWindows<NowPlayingWindow>().FirstOrDefault(x => x.LyricsWindowStatus == this);
+            if (targetWindow == null) return;
 
-        private void OldLyricsEffectSettings_PropertyChanged(object? sender, System.ComponentModel.PropertyChangedEventArgs e)
-        {
-            this.OnPropertyChanged(nameof(LyricsEffectSettings));
-        }
-
-        private void OldLyricsBackgroundSettings_PropertyChanged(object? sender, System.ComponentModel.PropertyChangedEventArgs e)
-        {
-            this.OnPropertyChanged(nameof(LyricsBackgroundSettings));
-        }
-
-        private void OldAlbumArtLayoutSettings_PropertyChanged(object? sender, System.ComponentModel.PropertyChangedEventArgs e)
-        {
-            this.OnPropertyChanged(nameof(AlbumArtLayoutSettings));
-        }
-
-        public void UpdateMonitorNameAndBounds()
-        {
-            var lyricsWindow = WindowHook.GetWindow<NowPlayingWindow>();
-            if (lyricsWindow == null) return;
-
-            var mointor = MonitorHook.GetMonitorInfoExFromWindow(lyricsWindow);
+            var mointor = MonitorHook.GetMonitorInfoExFromWindow(targetWindow);
             MonitorDeviceName = mointor.szDevice;
             MonitorBounds = new Rect(
                 mointor.rcMonitor.Left,
@@ -165,17 +127,19 @@ namespace BetterLyrics.WinUI3.Models
 
         public object Clone()
         {
-            return new LyricsWindowStatus
+            return new LyricsWindowStatus(null)
             {
                 Name = this.Name,
                 IsDefault = this.IsDefault,
                 MonitorDeviceName = this.MonitorDeviceName,
                 IsWorkArea = this.IsWorkArea,
-                IsBorderless = this.IsBorderless,
                 IsAlwaysOnTop = this.IsAlwaysOnTop,
                 IsAlwaysOnTopPolling = this.IsAlwaysOnTopPolling,
                 IsShownInSwitchers = this.IsShownInSwitchers,
-                IsClickThrough = this.IsClickThrough,
+                IsLocked = this.IsLocked,
+                IsMaximized = this.IsMaximized,
+                IsFullscreen = this.IsFullscreen,
+
                 LyricsLayoutOrientation = this.LyricsLayoutOrientation,
                 LyricsDisplayType = this.LyricsDisplayType,
                 WindowBounds = this.WindowBounds,
@@ -184,19 +148,17 @@ namespace BetterLyrics.WinUI3.Models
                 MonitorBounds = this.MonitorBounds,
                 DemoMonitorBounds = this.DemoMonitorBounds,
                 DockPlacement = this.DockPlacement,
+
                 LyricsStyleSettings = (LyricsStyleSettings)this.LyricsStyleSettings.Clone(),
                 LyricsEffectSettings = (LyricsEffectSettings)this.LyricsEffectSettings.Clone(),
                 LyricsBackgroundSettings = (LyricsBackgroundSettings)this.LyricsBackgroundSettings.Clone(),
-                AlbumArtLayoutSettings = (AlbumArtLayoutSettings)this.AlbumArtLayoutSettings.Clone(),
+                AlbumArtLayoutSettings = (AlbumArtAreaStyleSettings)this.AlbumArtLayoutSettings.Clone(),
+                AlbumArtAreaEffectSettings = (AlbumArtAreaEffectSettings)this.AlbumArtAreaEffectSettings.Clone(),
+
                 IsAdaptToEnvironment = this.IsAdaptToEnvironment,
                 EnvironmentSampleMode = this.EnvironmentSampleMode,
                 AutoShowOrHideWindow = this.AutoShowOrHideWindow,
                 TitleBarArea = this.TitleBarArea,
-
-                WindowX = this.WindowX,
-                WindowY = this.WindowY,
-                WindowWidth = this.WindowWidth,
-                WindowHeight = this.WindowHeight,
             };
 
         }

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/MediaSourceProviderInfo.cs

@@ -6,6 +6,7 @@ using BetterLyrics.WinUI3.Helper;
 using CommunityToolkit.Mvvm.ComponentModel;
 using System;
 using System.Linq;
+using System.Text.Json.Serialization;
 
 namespace BetterLyrics.WinUI3.Models
 {
@@ -32,13 +33,13 @@ namespace BetterLyrics.WinUI3.Models
 
         [ObservableProperty][NotifyPropertyChangedRecipients] public partial FullyObservableCollection<AlbumArtSearchProviderInfo> AlbumArtSearchProvidersInfo { get; set; } = [.. Enum.GetValues<AlbumArtSearchProvider>().Select(p => new AlbumArtSearchProviderInfo(p, true))];
         [ObservableProperty][NotifyPropertyChangedRecipients] public partial LyricsSearchType LyricsSearchType { get; set; } = LyricsSearchType.Sequential;
-        [ObservableProperty][NotifyPropertyChangedRecipients] public partial int MatchingThreshold { get; set; } = 0;
+        [ObservableProperty][NotifyPropertyChangedRecipients] public partial int MatchingThreshold { get; set; } = 40;
 
-        public string LogoPath => PlayerIDHelper.GetLogoPath(Provider);
+        [JsonIgnore] public string LogoPath => PlayerIDHelper.GetLogoPath(Provider);
 
-        public string? DisplayName => PlayerIDHelper.GetDisplayName(Provider);
+        [JsonIgnore] public string? DisplayName => PlayerIDHelper.GetDisplayName(Provider);
 
-        public bool IsLXMusic => PlayerIDHelper.IsLXMusic(Provider);
+        [JsonIgnore] public bool IsLXMusic => PlayerIDHelper.IsLXMusic(Provider);
 
         public MediaSourceProviderInfo()
         {

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/RenderLyricsLine.cs

@@ -0,0 +1,225 @@
+using BetterLyrics.WinUI3.Enums;
+using BetterLyrics.WinUI3.Extensions;
+using BetterLyrics.WinUI3.Helper;
+using Microsoft.Graphics.Canvas.Geometry;
+using Microsoft.Graphics.Canvas.Text;
+using Microsoft.Graphics.Canvas.UI.Xaml;
+using Microsoft.UI;
+using System.Numerics;
+using Windows.UI;
+
+namespace BetterLyrics.WinUI3.Models
+{
+    public class RenderLyricsLine : LyricsLine
+    {
+        public double AnimationDuration { get; set; } = 0.3;
+        public ValueTransition<double> AngleTransition { get; set; }
+        public ValueTransition<double> BlurAmountTransition { get; set; }
+        public ValueTransition<double> PhoneticOpacityTransition { get; set; }
+        public ValueTransition<double> PlayedOriginalOpacityTransition { get; set; }
+        public ValueTransition<double> UnplayedOriginalOpacityTransition { get; set; }
+        public ValueTransition<double> TranslatedOpacityTransition { get; set; }
+        public ValueTransition<double> ScaleTransition { get; set; }
+        public ValueTransition<double> YOffsetTransition { get; set; }
+        public ValueTransition<Color> ColorTransition { get; set; }
+
+        public CanvasTextLayout? OriginalCanvasTextLayout { get; private set; }
+        public CanvasTextLayout? TranslatedCanvasTextLayout { get; private set; }
+        public CanvasTextLayout? PhoneticCanvasTextLayout { get; private set; }
+
+        /// <summary>
+        /// 原文坐标（相对于坐标原点）
+        /// </summary>
+        public Vector2 OriginalPosition { get; set; }
+        /// <summary>
+        /// 译文坐标（相对于坐标原点）
+        /// </summary>
+        public Vector2 TranslatedPosition { get; set; }
+        /// <summary>
+        /// 注音坐标（相对于坐标原点）
+        /// </summary>
+        public Vector2 PhoneticPosition { get; set; }
+
+        /// <summary>
+        /// 顶部坐标（相对于坐标原点）
+        /// </summary>
+        public Vector2 TopLeftPosition { get; set; }
+        /// <summary>
+        /// 中心坐标（相对于坐标原点）
+        /// </summary>
+        public Vector2 CenterPosition { get; private set; }
+        /// <summary>
+        /// 底部坐标（相对于坐标原点）
+        /// </summary>
+        public Vector2 BottomRightPosition { get; set; }
+
+        public CanvasGeometry? OriginalCanvasGeometry { get; private set; }
+        public CanvasGeometry? TranslatedCanvasGeometry { get; private set; }
+        public CanvasGeometry? PhoneticCanvasGeometry { get; private set; }
+
+        public RenderLyricsLine()
+        {
+            AngleTransition = new(
+                initialValue: 0,
+                durationSeconds: AnimationDuration,
+                easingType: EasingType.EaseInOutSine
+            );
+            BlurAmountTransition = new(
+                 initialValue: 0,
+                 durationSeconds: AnimationDuration,
+                 easingType: EasingType.EaseInOutSine
+             );
+            PhoneticOpacityTransition = new(
+                initialValue: 0,
+                durationSeconds: AnimationDuration,
+                easingType: EasingType.EaseInOutSine
+            );
+            PlayedOriginalOpacityTransition = new(
+                initialValue: 0,
+                durationSeconds: AnimationDuration,
+                easingType: EasingType.EaseInOutSine
+            );
+            UnplayedOriginalOpacityTransition = new(
+                initialValue: 0,
+                durationSeconds: AnimationDuration,
+                easingType: EasingType.EaseInOutSine
+            );
+            TranslatedOpacityTransition = new(
+                initialValue: 0,
+                durationSeconds: AnimationDuration,
+                easingType: EasingType.EaseInOutSine
+            );
+            ScaleTransition = new(
+                initialValue: 0,
+                durationSeconds: AnimationDuration,
+                easingType: EasingType.EaseInOutSine
+            );
+            YOffsetTransition = new(
+                initialValue: 0,
+                durationSeconds: AnimationDuration,
+                easingType: EasingType.EaseInOutSine
+            );
+            ColorTransition = new(
+                initialValue: Colors.Transparent,
+                durationSeconds: 0.3f,
+                interpolator: (from, to, progress) => Helper.ColorHelper.GetInterpolatedColor(progress, from, to)
+            );
+        }
+
+        public void UpdateCenterPosition(double maxWidth, TextAlignmentType type)
+        {
+            if (OriginalCanvasTextLayout == null)
+            {
+                return;
+            }
+
+            double centerY = (TopLeftPosition.Y + BottomRightPosition.Y) / 2;
+
+            CenterPosition = type switch
+            {
+                TextAlignmentType.Left => new Vector2(0, (float)centerY),
+                TextAlignmentType.Center => new Vector2((float)(0 + maxWidth / 2.0), (float)centerY),
+                TextAlignmentType.Right => new Vector2((float)(0 + maxWidth), (float)centerY),
+                _ => throw new System.ArgumentOutOfRangeException(nameof(type), type, null),
+            };
+        }
+
+        public void DisposeTextLayout()
+        {
+            PhoneticCanvasTextLayout?.Dispose();
+            PhoneticCanvasTextLayout = null;
+
+            OriginalCanvasTextLayout?.Dispose();
+            OriginalCanvasTextLayout = null;
+
+            TranslatedCanvasTextLayout?.Dispose();
+            TranslatedCanvasTextLayout = null;
+        }
+
+        public void RecreateTextLayout(
+            ICanvasAnimatedControl control,
+            bool createPhonetic, bool createTranslated,
+            int phoneticTextFontSize, int originalTextFontSize, int translatedTextFontSize,
+            LyricsFontWeight fontWeight,
+            string fontFamilyCJK, string fontFamilyWestern,
+            double maxWidth, double maxHeight, TextAlignmentType type)
+        {
+            DisposeTextLayout();
+
+            if (createPhonetic && PhoneticText != "")
+            {
+                PhoneticCanvasTextLayout = new CanvasTextLayout(control, PhoneticText, new CanvasTextFormat
+                {
+                    HorizontalAlignment = CanvasHorizontalAlignment.Left,
+                    VerticalAlignment = CanvasVerticalAlignment.Top,
+                    FontSize = phoneticTextFontSize,
+                    FontWeight = fontWeight.ToFontWeight(),
+                }, (float)maxWidth, (float)maxHeight)
+                {
+                    HorizontalAlignment = type.ToCanvasHorizontalAlignment(),
+                };
+                PhoneticCanvasTextLayout.SetFontFamily(PhoneticText, fontFamilyCJK, fontFamilyWestern);
+            }
+
+            OriginalCanvasTextLayout = new CanvasTextLayout(control, OriginalText, new CanvasTextFormat
+            {
+                HorizontalAlignment = CanvasHorizontalAlignment.Left,
+                VerticalAlignment = CanvasVerticalAlignment.Top,
+                FontSize = originalTextFontSize,
+                FontWeight = fontWeight.ToFontWeight(),
+            }, (float)maxWidth, (float)maxHeight)
+            {
+                HorizontalAlignment = type.ToCanvasHorizontalAlignment()
+            };
+            OriginalCanvasTextLayout.SetFontFamily(OriginalText, fontFamilyCJK, fontFamilyWestern);
+
+            if (createTranslated && TranslatedText != "")
+            {
+                TranslatedCanvasTextLayout = new CanvasTextLayout(control, TranslatedText, new CanvasTextFormat
+                {
+                    HorizontalAlignment = CanvasHorizontalAlignment.Left,
+                    VerticalAlignment = CanvasVerticalAlignment.Top,
+                    FontSize = translatedTextFontSize,
+                    FontWeight = fontWeight.ToFontWeight(),
+                }, (float)maxWidth, (float)maxHeight)
+                {
+                    HorizontalAlignment = type.ToCanvasHorizontalAlignment()
+                };
+                TranslatedCanvasTextLayout.SetFontFamily(TranslatedText, fontFamilyCJK, fontFamilyWestern);
+            }
+        }
+
+        public void DisposeTextGeometry()
+        {
+            PhoneticCanvasGeometry?.Dispose();
+            PhoneticCanvasGeometry = null;
+
+            OriginalCanvasGeometry?.Dispose();
+            OriginalCanvasGeometry = null;
+
+            TranslatedCanvasGeometry?.Dispose();
+            TranslatedCanvasGeometry = null;
+        }
+
+        public void RecreateTextGeometry()
+        {
+            DisposeTextGeometry();
+
+            if (PhoneticCanvasTextLayout != null)
+            {
+                PhoneticCanvasGeometry = CanvasGeometry.CreateText(PhoneticCanvasTextLayout);
+            }
+
+            if (OriginalCanvasTextLayout != null)
+            {
+                OriginalCanvasGeometry = CanvasGeometry.CreateText(OriginalCanvasTextLayout);
+            }
+
+            if (TranslatedCanvasTextLayout != null)
+            {
+                TranslatedCanvasGeometry = CanvasGeometry.CreateText(TranslatedCanvasTextLayout);
+            }
+        }
+
+    }
+}

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/Settings/AlbumArtAreaEffectSettings.cs

@@ -0,0 +1,19 @@
+using BetterLyrics.WinUI3.Enums;
+using CommunityToolkit.Mvvm.ComponentModel;
+using System;
+
+namespace BetterLyrics.WinUI3.Models.Settings
+{
+    public partial class AlbumArtAreaEffectSettings : ObservableRecipient, ICloneable
+    {
+        [ObservableProperty][NotifyPropertyChangedRecipients] public partial ImageSwitchType ImageSwitchType { get; set; } = ImageSwitchType.Slide;
+
+        public object Clone()
+        {
+            return new AlbumArtAreaEffectSettings()
+            {
+                ImageSwitchType = this.ImageSwitchType,
+            };
+        }
+    }
+}

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/Settings/AlbumArtAreaStyleSettings.cs

@@ -4,10 +4,12 @@ using System;
 
 namespace BetterLyrics.WinUI3.Models.Settings
 {
-    public partial class AlbumArtLayoutSettings : ObservableRecipient, ICloneable
+    public partial class AlbumArtAreaStyleSettings : ObservableRecipient, ICloneable
     {
         [ObservableProperty][NotifyPropertyChangedRecipients] public partial TextAlignmentType SongInfoAlignmentType { get; set; } = TextAlignmentType.Left;
 
+        [ObservableProperty][NotifyPropertyChangedRecipients] public partial bool IsAutoCoverImageHeight { get; set; } = true;
+        [ObservableProperty][NotifyPropertyChangedRecipients] public partial int CoverImageHeight { get; set; } = 128;
         [ObservableProperty][NotifyPropertyChangedRecipients] public partial int CoverImageRadius { get; set; } = 12; // 12 % of the cover image size
         [ObservableProperty][NotifyPropertyChangedRecipients] public partial int CoverImageShadowAmount { get; set; } = 12;
 
@@ -17,15 +19,19 @@ namespace BetterLyrics.WinUI3.Models.Settings
         [ObservableProperty][NotifyPropertyChangedRecipients] public partial bool ShowArtists { get; set; } = true;
         [ObservableProperty][NotifyPropertyChangedRecipients] public partial bool ShowAlbum { get; set; } = false;
 
-        public AlbumArtLayoutSettings() { }
+        public AlbumArtAreaStyleSettings() { }
 
         public object Clone()
         {
-            return new AlbumArtLayoutSettings
+            return new AlbumArtAreaStyleSettings
             {
                 SongInfoAlignmentType = this.SongInfoAlignmentType,
+
+                IsAutoCoverImageHeight = this.IsAutoCoverImageHeight,
+                CoverImageHeight = this.CoverImageHeight,
                 CoverImageRadius = this.CoverImageRadius,
                 CoverImageShadowAmount = this.CoverImageShadowAmount,
+
                 IsAutoSongInfoFontSize = this.IsAutoSongInfoFontSize,
                 SongInfoFontSize = this.SongInfoFontSize,
                 ShowTitle = this.ShowTitle,

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/Settings/GeneralSettings.cs

@@ -13,13 +13,15 @@ namespace BetterLyrics.WinUI3.Models.Settings
         [ObservableProperty][NotifyPropertyChangedRecipients] public partial bool ExitOnLyricsWindowClosed { get; set; } = false;
         [ObservableProperty][NotifyPropertyChangedRecipients] public partial bool ListenOnNewPlaybackSource { get; set; } = true;
         [ObservableProperty][NotifyPropertyChangedRecipients] public partial bool IgnoreCacheWhenSearching { get; set; } = false;
-        [ObservableProperty][NotifyPropertyChangedRecipients] public partial List<string> BorderlessShortcut { get; set; } = new List<string>() { "Ctrl", "Alt", "B" };
-        [ObservableProperty][NotifyPropertyChangedRecipients] public partial List<string> ClickThroughShortcut { get; set; } = new List<string>() { "Ctrl", "Alt", "C" };
+
         [ObservableProperty][NotifyPropertyChangedRecipients] public partial List<string> LyricsWindowSwitchShortcut { get; set; } = new List<string>() { "Ctrl", "Alt", "S" };
         [ObservableProperty][NotifyPropertyChangedRecipients] public partial List<string> PlayOrPauseShortcut { get; set; } = new List<string> { "Ctrl", "Alt", "P" };
         [ObservableProperty][NotifyPropertyChangedRecipients] public partial List<string> NextSongShortcut { get; set; } = new List<string> { "Ctrl", "Alt", "Right" };
         [ObservableProperty][NotifyPropertyChangedRecipients] public partial List<string> PreviousSongShortcut { get; set; } = new List<string> { "Ctrl", "Alt", "Left" };
 
+        [ObservableProperty][NotifyPropertyChangedRecipients] public partial bool MultiNowPlayingWindowMode { get; set; } = false;
+        [ObservableProperty][NotifyPropertyChangedRecipients] public partial bool AutoStartLyricsWindow { get; set; } = true;
+
         public GeneralSettings() { }
     }
 }

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/Settings/LyricsEffectSettings.cs

@@ -6,9 +6,22 @@ namespace BetterLyrics.WinUI3.Models.Settings
 {
     public partial class LyricsEffectSettings : ObservableRecipient, ICloneable
     {
+        [ObservableProperty][NotifyPropertyChangedRecipients] public partial bool IsLyricsBlurEffectEnabled { get; set; } = true;
+
         [ObservableProperty][NotifyPropertyChangedRecipients] public partial bool IsLyricsGlowEffectEnabled { get; set; } = true;
+        [ObservableProperty][NotifyPropertyChangedRecipients] public partial LyricsEffectScope LyricsGlowEffectScope { get; set; } = LyricsEffectScope.LongDurationSyllable;
+        [ObservableProperty][NotifyPropertyChangedRecipients] public partial int LyricsGlowEffectLongSyllableDuration { get; set; } = 700; // 700ms
+        [ObservableProperty][NotifyPropertyChangedRecipients] public partial bool IsLyricsGlowEffectAmountAutoAdjust { get; set; } = true;
+        [ObservableProperty][NotifyPropertyChangedRecipients] public partial int LyricsGlowEffectAmount { get; set; } = 8;
+
         [ObservableProperty][NotifyPropertyChangedRecipients] public partial bool IsLyricsScaleEffectEnabled { get; set; } = true;
+        [ObservableProperty][NotifyPropertyChangedRecipients] public partial int LyricsScaleEffectLongSyllableDuration { get; set; } = 700; // 700ms
+        [ObservableProperty][NotifyPropertyChangedRecipients] public partial bool IsLyricsScaleEffectAmountAutoAdjust { get; set; } = true;
+        [ObservableProperty][NotifyPropertyChangedRecipients] public partial int LyricsScaleEffectAmount { get; set; } = 115; // 115%
+
         [ObservableProperty][NotifyPropertyChangedRecipients] public partial bool IsLyricsFloatAnimationEnabled { get; set; } = true;
+        [ObservableProperty][NotifyPropertyChangedRecipients] public partial bool IsLyricsFloatAnimationAmountAutoAdjust { get; set; } = true;
+        [ObservableProperty][NotifyPropertyChangedRecipients] public partial int LyricsFloatAnimationAmount { get; set; } = 8;
 
         [ObservableProperty][NotifyPropertyChangedRecipients] public partial EasingType LyricsScrollEasingType { get; set; }
         [ObservableProperty][NotifyPropertyChangedRecipients] public partial int LyricsScrollDuration { get; set; }
@@ -38,9 +51,21 @@ namespace BetterLyrics.WinUI3.Models.Settings
         {
             return new LyricsEffectSettings(this.LyricsScrollTopDuration, this.LyricsScrollDuration, this.LyricsScrollBottomDuration, this.LyricsScrollEasingType)
             {
+                IsLyricsBlurEffectEnabled = this.IsLyricsBlurEffectEnabled,
+
                 IsLyricsGlowEffectEnabled = this.IsLyricsGlowEffectEnabled,
+                LyricsGlowEffectLongSyllableDuration = this.LyricsGlowEffectLongSyllableDuration,
+                IsLyricsGlowEffectAmountAutoAdjust = this.IsLyricsGlowEffectAmountAutoAdjust,
+                LyricsGlowEffectAmount = this.LyricsGlowEffectAmount,
+
                 IsLyricsScaleEffectEnabled = this.IsLyricsScaleEffectEnabled,
+                LyricsScaleEffectLongSyllableDuration = this.LyricsScaleEffectLongSyllableDuration,
+                IsLyricsScaleEffectAmountAutoAdjust = this.IsLyricsScaleEffectAmountAutoAdjust,
+                LyricsScaleEffectAmount = this.LyricsScaleEffectAmount,
+
                 IsLyricsFloatAnimationEnabled = this.IsLyricsFloatAnimationEnabled,
+                IsLyricsFloatAnimationAmountAutoAdjust = this.IsLyricsFloatAnimationAmountAutoAdjust,
+                LyricsFloatAnimationAmount = this.LyricsFloatAnimationAmount,
 
                 LyricsScrollEasingType = this.LyricsScrollEasingType,
                 LyricsScrollDuration = this.LyricsScrollDuration,

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/Settings/LyricsStyleSettings.cs

@@ -14,19 +14,31 @@ namespace BetterLyrics.WinUI3.Models.Settings
         [ObservableProperty][NotifyPropertyChangedRecipients] public partial int PhoneticLyricsFontSize { get; set; } = 12;
         [ObservableProperty][NotifyPropertyChangedRecipients] public partial int OriginalLyricsFontSize { get; set; } = 24;
         [ObservableProperty][NotifyPropertyChangedRecipients] public partial int TranslatedLyricsFontSize { get; set; } = 12;
+
+        [ObservableProperty][NotifyPropertyChangedRecipients] public partial int PhoneticLyricsOpacity { get; set; } = 60; // 60 %
+        [ObservableProperty][NotifyPropertyChangedRecipients] public partial int OriginalLyricsOpacity { get; set; } = 30; // 30 %
+        [ObservableProperty][NotifyPropertyChangedRecipients] public partial int TranslatedLyricsOpacity { get; set; } = 60; // 60 %
+
         [ObservableProperty][NotifyPropertyChangedRecipients] public partial TextAlignmentType LyricsAlignmentType { get; set; } = TextAlignmentType.Left;
         [ObservableProperty][NotifyPropertyChangedRecipients] public partial int LyricsFontStrokeWidth { get; set; } = 0;
+
         [ObservableProperty][NotifyPropertyChangedRecipients] public partial Color LyricsCustomBgFontColor { get; set; } = Colors.White;
         [ObservableProperty][NotifyPropertyChangedRecipients] public partial Color LyricsCustomFgFontColor { get; set; } = Colors.White;
         [ObservableProperty][NotifyPropertyChangedRecipients] public partial Color LyricsCustomStrokeFontColor { get; set; } = Colors.White;
+
         [ObservableProperty][NotifyPropertyChangedRecipients] public partial LyricsFontColorType LyricsBgFontColorType { get; set; } = LyricsFontColorType.AdaptiveGrayed;
         [ObservableProperty][NotifyPropertyChangedRecipients] public partial LyricsFontColorType LyricsFgFontColorType { get; set; } = LyricsFontColorType.AdaptiveGrayed;
         [ObservableProperty][NotifyPropertyChangedRecipients] public partial LyricsFontColorType LyricsStrokeFontColorType { get; set; } = LyricsFontColorType.AdaptiveGrayed;
+
         [ObservableProperty][NotifyPropertyChangedRecipients] public partial LyricsFontWeight LyricsFontWeight { get; set; } = LyricsFontWeight.Bold;
+
         [ObservableProperty][NotifyPropertyChangedRecipients] public partial double LyricsLineSpacingFactor { get; set; } = 0.5;
+
         [ObservableProperty][NotifyPropertyChangedRecipients] public partial string LyricsCJKFontFamily { get; set; } = FontHelper.SystemFontFamilies.FirstOrDefault() ?? "";
         [ObservableProperty][NotifyPropertyChangedRecipients] public partial string LyricsWesternFontFamily { get; set; } = FontHelper.SystemFontFamilies.FirstOrDefault() ?? "";
 
+        [ObservableProperty][NotifyPropertyChangedRecipients] public partial int PlayingLineTopOffset { get; set; } = 50; // 50 %
+
         public LyricsStyleSettings() { }
 
         public object Clone()
@@ -37,6 +49,11 @@ namespace BetterLyrics.WinUI3.Models.Settings
                 PhoneticLyricsFontSize = this.PhoneticLyricsFontSize,
                 OriginalLyricsFontSize = this.OriginalLyricsFontSize,
                 TranslatedLyricsFontSize = this.TranslatedLyricsFontSize,
+
+                PhoneticLyricsOpacity = this.PhoneticLyricsOpacity,
+                OriginalLyricsOpacity = this.OriginalLyricsOpacity,
+                TranslatedLyricsOpacity = this.TranslatedLyricsOpacity,
+
                 LyricsAlignmentType = this.LyricsAlignmentType,
                 LyricsFontStrokeWidth = this.LyricsFontStrokeWidth,
                 LyricsCustomBgFontColor = this.LyricsCustomBgFontColor,
@@ -49,6 +66,8 @@ namespace BetterLyrics.WinUI3.Models.Settings
                 LyricsLineSpacingFactor = this.LyricsLineSpacingFactor,
                 LyricsCJKFontFamily = this.LyricsCJKFontFamily,
                 LyricsWesternFontFamily = this.LyricsWesternFontFamily,
+
+                PlayingLineTopOffset = this.PlayingLineTopOffset,
             };
         }
     }

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/Settings/MusicGallerySettings.cs

@@ -11,6 +11,8 @@ namespace BetterLyrics.WinUI3.Models.Settings
         [ObservableProperty][NotifyPropertyChangedRecipients] public partial int PlayQueueIndex { get; set; } = -1;
         [ObservableProperty][NotifyPropertyChangedRecipients] public partial bool AutoOpen { get; set; } = false;
         [ObservableProperty][NotifyPropertyChangedRecipients] public partial bool AutoPlay { get; set; } = false;
+        [ObservableProperty][NotifyPropertyChangedRecipients] public partial LyricsWindowStatus LyricsWindowStatus { get; set; } = new();
+        [ObservableProperty][NotifyPropertyChangedRecipients] public partial bool ExitOnWindowClosed { get; set; } = false;
 
         public MusicGallerySettings() { }
     }

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/Settings/TranslationSettings.cs

@@ -10,7 +10,6 @@ namespace BetterLyrics.WinUI3.Models.Settings
         [ObservableProperty][NotifyPropertyChangedRecipients] public partial string LibreTranslateServer { get; set; } = string.Empty;
         [ObservableProperty][NotifyPropertyChangedRecipients] public partial bool IsTranslationEnabled { get; set; } = true;
         [ObservableProperty][NotifyPropertyChangedRecipients] public partial string SelectedTargetLanguageCode { get; set; } = LanguageHelper.GetDefaultTargetTranslationLanguageCode();
-        [ObservableProperty][NotifyPropertyChangedRecipients] public partial bool IsJyutpingEnabled { get; set; } = false;
         [ObservableProperty][NotifyPropertyChangedRecipients] public partial ChineseRomanization ChineseRomanization { get; set; }
         [ObservableProperty][NotifyPropertyChangedRecipients] public partial bool IsChineseRomanizationEnabled { get; set; } = false;
         [ObservableProperty][NotifyPropertyChangedRecipients] public partial bool IsJapaneseRomanizationEnabled { get; set; } = false;

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Parsers/LyricsParser/LyricsParser.Lrc.cs

@@ -73,7 +73,7 @@ namespace BetterLyrics.WinUI3.Parsers.LyricsParser
 
             if (single)
             {
-                LyricsDataArr.Add(new LyricsData(lrcLines));
+                _lyricsDataArr.Add(new LyricsData(lrcLines));
             }
             else
             {
@@ -87,8 +87,8 @@ namespace BetterLyrics.WinUI3.Parsers.LyricsParser
                 }
 
                 // 初始化每种语言的歌词列表
-                int langStartIndex = LyricsDataArr.Count;
-                for (int i = 0; i < languageCount; i++) LyricsDataArr.Add(new LyricsData());
+                int langStartIndex = _lyricsDataArr.Count;
+                for (int i = 0; i < languageCount; i++) _lyricsDataArr.Add(new LyricsData());
 
                 // 遍历每个时间分组
                 if (grouped != null)
@@ -102,7 +102,7 @@ namespace BetterLyrics.WinUI3.Parsers.LyricsParser
                             if (langIdx < linesInGroup.Count)
                             {
                                 var lyricsLine = linesInGroup[langIdx];
-                                LyricsDataArr[langStartIndex + langIdx].LyricsLines.Add(lyricsLine);
+                                _lyricsDataArr[langStartIndex + langIdx].LyricsLines.Add(lyricsLine);
                             }
                             // 没有翻译行则不补原文，直接跳过
                         }

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Parsers/LyricsParser/LyricsParser.QrcKrc.cs

@@ -52,7 +52,7 @@ namespace BetterLyrics.WinUI3.Parsers.LyricsParser
                 }
             }
 
-            LyricsDataArr.Add(new LyricsData(lyricsLines));
+            _lyricsDataArr.Add(new LyricsData(lyricsLines));
         }
 
     }

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Parsers/LyricsParser/LyricsParser.Ttml.cs

@@ -85,14 +85,14 @@ namespace BetterLyrics.WinUI3.Parsers.LyricsParser
                     ParseTtmlXRole(spans, romanLines, "x-roman", pStartMs, pEndMs);
                 }
 
-                LyricsDataArr.Add(new LyricsData(originalLines));
+                _lyricsDataArr.Add(new LyricsData(originalLines));
                 if (translationLines.Count > 0)
                 {
-                    LyricsDataArr.Add(new LyricsData(translationLines));
+                    _lyricsDataArr.Add(new LyricsData(translationLines));
                 }
                 if (romanLines.Count > 0)
                 {
-                    LyricsDataArr.Add(new LyricsData(romanLines) { LanguageCode = PhoneticHelper.RomanCode });
+                    _lyricsDataArr.Add(new LyricsData(romanLines) { LanguageCode = PhoneticHelper.RomanCode });
                 }
             }
             catch

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Parsers/LyricsParser/LyricsParser.cs

@@ -4,11 +4,18 @@ using BetterLyrics.WinUI3.Enums;
 using BetterLyrics.WinUI3.Extensions;
 using BetterLyrics.WinUI3.Helper;
 using BetterLyrics.WinUI3.Models;
+using BetterLyrics.WinUI3.Models.Settings;
+using BetterLyrics.WinUI3.Services.TranslateService;
 using CommunityToolkit.Mvvm.DependencyInjection;
+using Lyricify.Lyrics.Helpers.General;
 using Lyricify.Lyrics.Parsers;
 using Microsoft.Extensions.Logging;
+using Microsoft.UI.Xaml.Controls;
+using System;
 using System.Collections.Generic;
 using System.Linq;
+using System.Threading;
+using System.Threading.Tasks;
 
 namespace BetterLyrics.WinUI3.Parsers.LyricsParser
 {
@@ -16,15 +23,19 @@ namespace BetterLyrics.WinUI3.Parsers.LyricsParser
     {
         private static readonly ILogger<LyricsParser> _logger = Ioc.Default.GetRequiredService<ILogger<LyricsParser>>();
 
-        public List<LyricsData> LyricsDataArr { get; private set; } = [];
+        private List<LyricsData> _lyricsDataArr = [];
 
-        public void Parse(SongInfo? songInfo, LyricsSearchResult? lyricsSearchResult)
+        public LyricsParser()
+        {
+        }
+
+        public List<LyricsData> Parse(LyricsSearchResult? lyricsSearchResult)
         {
             _logger.LogInformation("LyricsParser.Parse");
-            LyricsDataArr = [];
+            _lyricsDataArr = [];
             if (string.IsNullOrWhiteSpace(lyricsSearchResult?.Raw))
             {
-                LyricsDataArr.Add(LyricsData.GetNotfoundPlaceholder());
+                _lyricsDataArr.Add(LyricsData.GetNotfoundPlaceholder());
             }
             else
             {
@@ -47,14 +58,98 @@ namespace BetterLyrics.WinUI3.Parsers.LyricsParser
                         break;
                 }
 
-                if (LyricsDataArr.Count == 0)
+                if (_lyricsDataArr.Count == 0)
                 {
-                    LyricsDataArr.Add(LyricsData.GetNotfoundPlaceholder());
+                    _lyricsDataArr.Add(LyricsData.GetNotfoundPlaceholder());
                 }
             }
             LoadTranslation(lyricsSearchResult);
             LoadTransliteration(lyricsSearchResult);
             GenerateTransliterationLyricsData();
+
+            return _lyricsDataArr;
+        }
+
+        public async Task<(LyricsData, TransliterationSearchProvider?, TranslationSearchProvider?)> Parse(ITranslateService translateService, TranslationSettings settings, LyricsSearchResult? lyricsSearchResult, CancellationToken token)
+        {
+            TransliterationSearchProvider? transliterationSearchProvider = null;
+            TranslationSearchProvider? translationSearchProvider = null;
+
+            Parse(lyricsSearchResult);
+
+            var main = _lyricsDataArr.First();
+
+            // 应用音译
+            LyricsData? phoneticLyricsData = null;
+            if (settings.IsChineseRomanizationEnabled && main.LanguageCode == LanguageHelper.ChineseCode)
+            {
+                phoneticLyricsData = settings.ChineseRomanization switch
+                {
+                    ChineseRomanization.Pinyin => _lyricsDataArr.FirstOrDefault(x => x.LanguageCode == PhoneticHelper.PinyinCode),
+                    ChineseRomanization.Jyutping => _lyricsDataArr.FirstOrDefault(x => x.LanguageCode == PhoneticHelper.JyutpingCode),
+                    _ => null,
+                };
+            }
+            else if (settings.IsJapaneseRomanizationEnabled && main.LanguageCode == LanguageHelper.JapaneseCode)
+            {
+                phoneticLyricsData = _lyricsDataArr.FirstOrDefault(x => x.LanguageCode == PhoneticHelper.RomanCode);
+            }
+            if (phoneticLyricsData != null)
+            {
+                main.SetPhoneticText(phoneticLyricsData);
+                if (phoneticLyricsData.AutoGenerated)
+                {
+                    transliterationSearchProvider = TransliterationSearchProvider.BetterLyrics;
+                }
+                else
+                {
+                    transliterationSearchProvider = lyricsSearchResult?.Provider.ToTransliterationSearchProvider();
+                }
+            }
+
+            // 应用翻译
+            if (settings.IsTranslationEnabled && main.LanguageCode != settings.SelectedTargetLanguageCode)
+            {
+                var found = _lyricsDataArr.FirstOrDefault(x => x.LanguageCode == settings.SelectedTargetLanguageCode);
+                if (found != null)
+                {
+                    main.SetTranslatedText(found);
+                    translationSearchProvider = lyricsSearchResult?.Provider.ToTranslationSearchProvider();
+                }
+                else if (settings.IsLibreTranslateEnabled)
+                {
+                    string translated = string.Empty;
+                    try
+                    {
+                        translated = await translateService.TranslateTextAsync(main.WrappedOriginalText, settings.SelectedTargetLanguageCode, token);
+                        _lyricsDataArr.FirstOrDefault()?.SetTranslation(translated);
+                        translationSearchProvider = TranslationSearchProvider.LibreTranslate;
+                    }
+                    catch (TaskCanceledException) { }
+                    catch (Exception)
+                    {
+                        ToastHelper.ShowToast("LibreTranslateFailed", null, InfoBarSeverity.Error);
+                    }
+                }
+            }
+
+            // 应用简体中文/繁体中文
+            if (main.LanguageCode == LanguageHelper.ChineseCode)
+            {
+                foreach (var item in main.LyricsLines)
+                {
+                    item.OriginalText = settings.IsTraditionalChineseEnabled ? ChineseHelper.ToTC(item.OriginalText) : ChineseHelper.ToSC(item.OriginalText);
+                }
+            }
+            if (settings.SelectedTargetLanguageCode == LanguageHelper.ChineseCode)
+            {
+                foreach (var item in main.LyricsLines)
+                {
+                    item.TranslatedText = settings.IsTraditionalChineseEnabled ? ChineseHelper.ToTC(item.TranslatedText) : ChineseHelper.ToSC(item.TranslatedText);
+                }
+            }
+
+            return (main, transliterationSearchProvider, translationSearchProvider);
         }
 
         private void LoadTranslation(LyricsSearchResult? lyricsSearchResult)
@@ -82,7 +177,7 @@ namespace BetterLyrics.WinUI3.Parsers.LyricsParser
                 {
                     case LyricsSearchProvider.Netease:
                         ParseLrc(lyricsSearchResult.Transliteration, true);
-                        LyricsDataArr.LastOrDefault()?.LanguageCode = PhoneticHelper.RomanCode;
+                        _lyricsDataArr.LastOrDefault()?.LanguageCode = PhoneticHelper.RomanCode;
                         break;
                     default:
                         break;
@@ -95,15 +190,15 @@ namespace BetterLyrics.WinUI3.Parsers.LyricsParser
         /// </summary>
         private void GenerateTransliterationLyricsData()
         {
-            var main = LyricsDataArr.FirstOrDefault();
+            var main = _lyricsDataArr.FirstOrDefault();
             if (main != null)
             {
                 string? languageCode = main.LanguageCode;
                 if (languageCode == LanguageHelper.ChineseCode)
                 {
-                    if (!LyricsDataArr.Any(x => x.LanguageCode == PhoneticHelper.PinyinCode))
+                    if (!_lyricsDataArr.Any(x => x.LanguageCode == PhoneticHelper.PinyinCode))
                     {
-                        LyricsDataArr.Add(new LyricsData
+                        _lyricsDataArr.Add(new LyricsData
                         {
                             LanguageCode = PhoneticHelper.PinyinCode,
                             AutoGenerated = true,
@@ -122,9 +217,9 @@ namespace BetterLyrics.WinUI3.Parsers.LyricsParser
                             }).ToList()
                         });
                     }
-                    if (!LyricsDataArr.Any(x => x.LanguageCode == PhoneticHelper.JyutpingCode))
+                    if (!_lyricsDataArr.Any(x => x.LanguageCode == PhoneticHelper.JyutpingCode))
                     {
-                        LyricsDataArr.Add(new LyricsData
+                        _lyricsDataArr.Add(new LyricsData
                         {
                             LanguageCode = PhoneticHelper.JyutpingCode,
                             AutoGenerated = true,
@@ -146,9 +241,9 @@ namespace BetterLyrics.WinUI3.Parsers.LyricsParser
                 }
                 else if (languageCode == LanguageHelper.JapaneseCode)
                 {
-                    if (!LyricsDataArr.Any(x => x.LanguageCode == PhoneticHelper.RomanCode))
+                    if (!_lyricsDataArr.Any(x => x.LanguageCode == PhoneticHelper.RomanCode))
                     {
-                        LyricsDataArr.Add(new LyricsData
+                        _lyricsDataArr.Add(new LyricsData
                         {
                             LanguageCode = PhoneticHelper.RomanCode,
                             AutoGenerated = true,
@@ -170,5 +265,6 @@ namespace BetterLyrics.WinUI3.Parsers.LyricsParser
                 }
             }
         }
+
     }
 }

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Renderer/FluidBackgroundRenderer.cs

@@ -63,14 +63,14 @@ namespace BetterLyrics.WinUI3.Renderer
 
             _timeAccumulator += (float)deltaTime.TotalSeconds;
 
-            _fluidEffect.Properties["iTime"] = _timeAccumulator;
+            _fluidEffect?.Properties["iTime"] = _timeAccumulator;
 
-            _fluidEffect.Properties["color1"] = _c1;
-            _fluidEffect.Properties["color2"] = _c2;
-            _fluidEffect.Properties["color3"] = _c3;
-            _fluidEffect.Properties["color4"] = _c4;
+            _fluidEffect?.Properties["color1"] = _c1;
+            _fluidEffect?.Properties["color2"] = _c2;
+            _fluidEffect?.Properties["color3"] = _c3;
+            _fluidEffect?.Properties["color4"] = _c4;
 
-            _fluidEffect.Properties["EnableLightWave"] = EnableLightWave;
+            _fluidEffect?.Properties["EnableLightWave"] = EnableLightWave;
         }
 
         public void Draw(ICanvasAnimatedControl control, CanvasDrawingSession ds)

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Renderer/LyricsRenderer.cs

@@ -7,6 +7,7 @@ using Microsoft.Graphics.Canvas.Geometry;
 using Microsoft.Graphics.Canvas.Text;
 using Microsoft.Graphics.Canvas.UI.Xaml;
 using System;
+using System.Collections.Generic;
 using System.Linq;
 using System.Numerics;
 using Windows.UI;
@@ -23,7 +24,7 @@ namespace BetterLyrics.WinUI3.Renderer
         public void Draw(
             ICanvasAnimatedControl control,
             CanvasDrawingSession ds,
-            LyricsData? lyricsData,
+            IList<RenderLyricsLine>? lines,
             int playingLineIndex,
             int mouseHoverLineIndex,
             bool isMousePressing,
@@ -35,6 +36,7 @@ namespace BetterLyrics.WinUI3.Renderer
             double lyricsHeight,
             double userScrollOffset,
             double lyricsOpacity,
+            double playingLineTopOffsetFactor,
             LyricsWindowStatus windowStatus,
             Color strokeColor,
             Color bgColor,
@@ -52,7 +54,7 @@ namespace BetterLyrics.WinUI3.Renderer
                             DrawLyrics(
                                 control,
                                 layerDs,
-                                lyricsData,
+                                lines,
                                 playingLineIndex,
                                 mouseHoverLineIndex,
                                 isMousePressing,
@@ -63,6 +65,7 @@ namespace BetterLyrics.WinUI3.Renderer
                                 lyricsWidth,
                                 lyricsHeight,
                                 userScrollOffset,
+                                playingLineTopOffsetFactor,
                                 windowStatus,
                                 strokeColor,
                                 bgColor,
@@ -82,7 +85,7 @@ namespace BetterLyrics.WinUI3.Renderer
                     DrawLyrics(
                         control,
                         ds,
-                        lyricsData,
+                        lines,
                         playingLineIndex,
                         mouseHoverLineIndex,
                         isMousePressing,
@@ -93,6 +96,7 @@ namespace BetterLyrics.WinUI3.Renderer
                         lyricsWidth,
                         lyricsHeight,
                         userScrollOffset,
+                        playingLineTopOffsetFactor,
                         windowStatus,
                         strokeColor,
                         bgColor,
@@ -105,7 +109,7 @@ namespace BetterLyrics.WinUI3.Renderer
         private void DrawLyrics(
             ICanvasAnimatedControl control,
             CanvasDrawingSession ds,
-            LyricsData? lyricsData,
+            IList<RenderLyricsLine>? lines,
             int playingLineIndex,
             int mouseHoverLineIndex,
             bool isMousePressing,
@@ -116,15 +120,16 @@ namespace BetterLyrics.WinUI3.Renderer
             double lyricsWidth,
             double lyricsHeight,
             double userScrollOffset,
+            double playingLineTopOffsetFactor,
             LyricsWindowStatus windowStatus,
             Color strokeColor,
             Color bgColor,
             Color fgColor,
             Func<int, LinePlaybackState> getPlaybackState)
         {
-            if (lyricsData == null) return;
+            if (lines == null) return;
 
-            var currentPlayingLine = lyricsData.LyricsLines.ElementAtOrDefault(playingLineIndex);
+            var currentPlayingLine = lines.ElementAtOrDefault(playingLineIndex);
             if (currentPlayingLine == null) return;
 
             var effectSettings = windowStatus.LyricsEffectSettings;
@@ -134,13 +139,13 @@ namespace BetterLyrics.WinUI3.Renderer
 
             for (int i = startVisibleIndex; i <= endVisibleIndex; i++)
             {
-                var line = lyricsData.LyricsLines.ElementAtOrDefault(i);
+                var line = lines.ElementAtOrDefault(i);
                 if (line == null) continue;
 
                 if (line.OriginalCanvasTextLayout == null) continue;
                 if (line.OriginalCanvasTextLayout.LayoutBounds.Width <= 0) continue;
 
-                double yOffset = line.YOffsetTransition.Value + userScrollOffset + lyricsY + lyricsHeight / 2;
+                double yOffset = line.YOffsetTransition.Value + userScrollOffset + lyricsY + lyricsHeight * playingLineTopOffsetFactor;
 
                 var transform =
                     Matrix3x2.CreateScale((float)line.ScaleTransition.Value, line.CenterPosition) *
@@ -167,7 +172,7 @@ namespace BetterLyrics.WinUI3.Renderer
                         byte opacity = isMousePressing ? (byte)32 : (byte)16;
                         double scale = isMousePressing ? 1.09 : 1.10;
                         ds.FillRoundedRectangle(
-                            new Windows.Foundation.Rect(line.TopLeftPosition.ToPoint(), line.BottomRightPosition.ToPoint()).Scale(scale),
+                            new Windows.Foundation.Rect(line.TopLeftPosition.ToPoint().WithX(0), line.BottomRightPosition.ToPoint().WithX(lyricsWidth)).Scale(scale),
                             8, 8, Color.FromArgb(opacity, 255, 255, 255));
                     }
                 }
@@ -178,7 +183,7 @@ namespace BetterLyrics.WinUI3.Renderer
 
         private CanvasCommandList RenderBaseTextLayer(
             ICanvasResourceCreator resourceCreator,
-            LyricsLine line,
+            RenderLyricsLine line,
             double strokeWidth,
             Color strokeColor,
             Color fillColor)

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Renderer/PlayingLineRenderer.cs

@@ -20,7 +20,7 @@ namespace BetterLyrics.WinUI3.Renderer
             ICanvasAnimatedControl control,
             CanvasDrawingSession ds,
             ICanvasImage textOnlyLayer,
-            LyricsLine line,
+            RenderLyricsLine line,
             LinePlaybackState playbackState,
             Color bgColor,
             Color fgColor,
@@ -31,7 +31,7 @@ namespace BetterLyrics.WinUI3.Renderer
             DrawTranslated(ds, textOnlyLayer, line);
         }
 
-        private void DrawPhonetic(CanvasDrawingSession ds, ICanvasImage source, LyricsLine line)
+        private void DrawPhonetic(CanvasDrawingSession ds, ICanvasImage source, RenderLyricsLine line)
         {
             if (line.PhoneticCanvasTextLayout == null) return;
 
@@ -63,7 +63,7 @@ namespace BetterLyrics.WinUI3.Renderer
             });
         }
 
-        private void DrawTranslated(CanvasDrawingSession ds, ICanvasImage source, LyricsLine line)
+        private void DrawTranslated(CanvasDrawingSession ds, ICanvasImage source, RenderLyricsLine line)
         {
             if (line.TranslatedCanvasTextLayout == null) return;
 
@@ -99,7 +99,7 @@ namespace BetterLyrics.WinUI3.Renderer
             ICanvasResourceCreator resourceCreator,
             CanvasDrawingSession ds,
             ICanvasImage source,
-            LyricsLine line,
+            RenderLyricsLine line,
             LinePlaybackState state,
             Color bgColor,
             Color fgColor,
@@ -122,7 +122,7 @@ namespace BetterLyrics.WinUI3.Renderer
             ICanvasResourceCreator resourceCreator,
             CanvasDrawingSession ds,
             ICanvasImage source,
-            LyricsLine line,
+            RenderLyricsLine line,
             CanvasTextLayoutRegion subLineRegion,
             double curCharIndex,
             float fadeWidth,
@@ -131,7 +131,6 @@ namespace BetterLyrics.WinUI3.Renderer
             LinePlaybackState state,
             LyricsEffectSettings settings)
         {
-            var blur = line.BlurAmountTransition.Value;
             var playedOpacity = line.PlayedOriginalOpacityTransition.Value;
             var unplayedOpacity = line.UnplayedOriginalOpacityTransition.Value;
 
@@ -191,9 +190,19 @@ namespace BetterLyrics.WinUI3.Renderer
             }
         }
 
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <param name="ds"></param>
+        /// <param name="line"></param>
+        /// <param name="charIndex">遍历的字符索引</param>
+        /// <param name="exactProgressIndex">当前播放字符相对于整行的索引</param>
+        /// <param name="source"></param>
+        /// <param name="state"></param>
+        /// <param name="settings"></param>
         private void DrawSingleCharacter(
             CanvasDrawingSession ds,
-            LyricsLine line,
+            RenderLyricsLine line,
             int charIndex,
             double exactProgressIndex,
             ICanvasImage source,
@@ -223,7 +232,16 @@ namespace BetterLyrics.WinUI3.Renderer
 
             if (settings.IsLyricsFloatAnimationEnabled)
             {
-                double targetFloatOffset = sourceCharRect.Height * 0.1;
+                double targetFloatOffset;
+                if (settings.IsLyricsFloatAnimationAmountAutoAdjust)
+                {
+                    targetFloatOffset = sourceCharRect.Height * 0.1;
+                }
+                else
+                {
+                    targetFloatOffset = settings.LyricsFloatAnimationAmount;
+                }
+
                 // 已经浮完了的
                 if (charIndex < curCharIndexInt)
                 {
@@ -240,22 +258,74 @@ namespace BetterLyrics.WinUI3.Renderer
                 {
                     floatOffset = -targetFloatOffset;
                 }
+
                 // 制造句间上浮过度动画，这里用任何一个 Transition 都行，主要是获取当前行的进入视野的 Progress
                 floatOffset *= line.YOffsetTransition.Progress;
             }
 
             var parentSyllable = line.LyricsSyllables.FirstOrDefault(x => x.StartIndex <= charIndex && charIndex < x.StartIndex + x.Text.Length);
 
-            if (parentSyllable != null && parentSyllable.IsLongDuration && parentSyllable.StartIndex == state.SyllableStartIndex)
+            if (settings.IsLyricsScaleEffectEnabled)
             {
-                if (settings.IsLyricsScaleEffectEnabled)
+                if (parentSyllable != null && parentSyllable.StartIndex == state.SyllableStartIndex)
                 {
-                    scale += Math.Sin(state.SyllableProgress * Math.PI) * 0.15;
+                    if (parentSyllable.DurationMs >= settings.LyricsScaleEffectLongSyllableDuration)
+                    {
+                        if (settings.IsLyricsScaleEffectAmountAutoAdjust)
+                        {
+                            scale += Math.Sin(state.SyllableProgress * Math.PI) * 0.15;
+                        }
+                        else
+                        {
+                            scale += Math.Sin(state.SyllableProgress * Math.PI) * (settings.LyricsScaleEffectAmount / 100.0 - 1);
+                        }
+                    }
                 }
-                if (settings.IsLyricsGlowEffectEnabled)
+            }
+
+            if (settings.IsLyricsGlowEffectEnabled)
+            {
+                double maxGlow;
+                if (settings.IsLyricsGlowEffectAmountAutoAdjust)
                 {
-                    glow = Math.Sin(state.SyllableProgress * Math.PI) * sourceCharRect.Height * 0.2;
-                    drawGlow = true;
+                    maxGlow = sourceCharRect.Height * 0.2;
+                }
+                else
+                {
+                    maxGlow = settings.LyricsGlowEffectAmount;
+                }
+                switch (settings.LyricsGlowEffectScope)
+                {
+                    case Enums.LyricsEffectScope.LongDurationSyllable:
+                        if (parentSyllable != null && parentSyllable.StartIndex == state.SyllableStartIndex)
+                        {
+                            if (parentSyllable.DurationMs >= settings.LyricsGlowEffectLongSyllableDuration)
+                            {
+                                glow = maxGlow * Math.Sin(state.SyllableProgress * Math.PI);
+                                drawGlow = true;
+                            }
+                        }
+                        break;
+                    case Enums.LyricsEffectScope.LineStartToCurrentChar:
+                        // 已经唱了的
+                        if (charIndex < curCharIndexInt)
+                        {
+                            glow = maxGlow;
+                            drawGlow = true;
+                        }
+                        // 正在唱的
+                        else if (charIndex == curCharIndexInt)
+                        {
+                            var p = exactProgressIndex - curCharIndexInt;
+                            glow = p * maxGlow;
+                            drawGlow = true;
+                        }
+                        // 还没唱的
+                        else { }
+                        glow *= Math.Clamp(line.OriginalText.Length - exactProgressIndex, 0, 1);
+                        break;
+                    default:
+                        break;
                 }
             }
 

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Renderer/UnplayingLineRenderer.cs

@@ -12,7 +12,7 @@ namespace BetterLyrics.WinUI3.Renderer
         public void Draw(
             CanvasDrawingSession ds,
             ICanvasImage textOnlyLayer,
-            LyricsLine line)
+            RenderLyricsLine line)
         {
             var blurAmount = (float)line.BlurAmountTransition.Value;
 

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Services/LiveStatesService/ILiveStatesService.cs

@@ -1,10 +0,0 @@
-using BetterLyrics.WinUI3.Models;
-
-namespace BetterLyrics.WinUI3.Services.LiveStatesService
-{
-    public interface ILiveStatesService
-    {
-        LiveStates LiveStates { get; set; }
-        void InitLyricsWindowStatus();
-    }
-}

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Services/LiveStatesService/LiveStatesService.cs

@@ -1,154 +0,0 @@
-using BetterLyrics.WinUI3.Extensions;
-using BetterLyrics.WinUI3.Hooks;
-using BetterLyrics.WinUI3.Models;
-using BetterLyrics.WinUI3.Services.SettingsService;
-using BetterLyrics.WinUI3.ViewModels;
-using BetterLyrics.WinUI3.Views;
-using CommunityToolkit.Mvvm.Messaging;
-using CommunityToolkit.Mvvm.Messaging.Messages;
-using System.Linq;
-using System.Threading.Tasks;
-
-namespace BetterLyrics.WinUI3.Services.LiveStatesService
-{
-    public partial class LiveStatesService : BaseViewModel, ILiveStatesService,
-        IRecipient<PropertyChangedMessage<LyricsWindowStatus>>
-    {
-        private readonly ISettingsService _settingsService;
-
-        public LiveStates LiveStates { get; set; } = new LiveStates();
-
-        public LiveStatesService(ISettingsService settingsService)
-        {
-            _settingsService = settingsService;
-        }
-
-        public void InitLyricsWindowStatus()
-        {
-            var defaultLyricsWindowStatus = _settingsService.AppSettings.WindowBoundsRecords.FirstOrDefault(x => x.IsDefault);
-            if (defaultLyricsWindowStatus == null)
-            {
-                defaultLyricsWindowStatus = LyricsWindowStatusExtensions.StandardMode();
-                defaultLyricsWindowStatus.IsDefault = true;
-                _settingsService.AppSettings.WindowBoundsRecords.Add(defaultLyricsWindowStatus);
-                _settingsService.AppSettings.WindowBoundsRecords.Add(LyricsWindowStatusExtensions.DesktopMode());
-                _settingsService.AppSettings.WindowBoundsRecords.Add(LyricsWindowStatusExtensions.DockedMode());
-                _settingsService.AppSettings.WindowBoundsRecords.Add(LyricsWindowStatusExtensions.NarrowMode());
-                _settingsService.AppSettings.WindowBoundsRecords.Add(LyricsWindowStatusExtensions.FullscreenMode());
-            }
-            LiveStates.LyricsWindowStatus = defaultLyricsWindowStatus;
-        }
-
-        private async void RefreshLyricsWindowStatus()
-        {
-            LiveStates.IsLyricsWindowStatusRefreshing = true;
-
-            LiveStates.LyricsWindowStatus.UpdateMonitorBounds();
-
-            WindowHook.SetIsWorkArea<NowPlayingWindow>(LiveStates.LyricsWindowStatus.IsWorkArea);
-            if (LiveStates.LyricsWindowStatus.IsWorkArea)
-            {
-                WindowHook.UpdateWorkArea<NowPlayingWindow>();
-            }
-            await Task.Delay(300);
-
-            WindowHook.SetIsShowInSwitchers<NowPlayingWindow>(LiveStates.LyricsWindowStatus.IsShownInSwitchers);
-            WindowHook.SetIsAlwaysOnTop<NowPlayingWindow>(LiveStates.LyricsWindowStatus.IsAlwaysOnTop);
-
-            WindowHook.SetIsClickThrough<NowPlayingWindow>(LiveStates.LyricsWindowStatus.IsClickThrough);
-            WindowHook.SetIsBorderless<NowPlayingWindow>(LiveStates.LyricsWindowStatus.IsBorderless);
-
-            WindowHook.SetLyricsWindowVisibilityByPlayingStatus(_dispatcherQueue);
-            WindowHook.SetTitleBarArea<NowPlayingWindow>(LiveStates.LyricsWindowStatus.TitleBarArea);
-
-            // 下述代码可以删除，但是为了避免给用户造成操作上的疑虑，暂时保留
-            if (LiveStates.LyricsWindowStatus.IsWorkArea)
-            {
-                LiveStates.LyricsWindowStatus.WindowBounds = LiveStates.LyricsWindowStatus.GetWindowBoundsWhenWorkArea();
-            }
-
-            WindowHook.MoveAndResize<NowPlayingWindow>(LiveStates.LyricsWindowStatus.WindowBounds);
-            LiveStates.LyricsWindowStatus.WindowX = LiveStates.LyricsWindowStatus.WindowBounds.X;
-            LiveStates.LyricsWindowStatus.WindowY = LiveStates.LyricsWindowStatus.WindowBounds.Y;
-            LiveStates.LyricsWindowStatus.WindowWidth = LiveStates.LyricsWindowStatus.WindowBounds.Width;
-            LiveStates.LyricsWindowStatus.WindowHeight = LiveStates.LyricsWindowStatus.WindowBounds.Height;
-
-            LiveStates.LyricsWindowStatus.UpdateDemoWindowAndMonitorBounds();
-
-            LiveStates.IsLyricsWindowStatusRefreshing = false;
-        }
-
-        private void LyricsWindowStatus_PropertyChanged(object? sender, System.ComponentModel.PropertyChangedEventArgs e)
-        {
-            switch (e.PropertyName)
-            {
-                case nameof(LyricsWindowStatus.IsWorkArea):
-                    LiveStates.IsLyricsWindowStatusRefreshing = true;
-                    WindowHook.SetIsWorkArea<NowPlayingWindow>(LiveStates.LyricsWindowStatus.IsWorkArea);
-                    LiveStates.IsLyricsWindowStatusRefreshing = false;
-                    if (LiveStates.LyricsWindowStatus.IsWorkArea)
-                    {
-                        WindowHook.MoveAndResize<NowPlayingWindow>(LiveStates.LyricsWindowStatus.GetWindowBoundsWhenWorkArea());
-                    }
-                    break;
-                case nameof(LyricsWindowStatus.DockHeight):
-                case nameof(LyricsWindowStatus.DockPlacement):
-                case nameof(LyricsWindowStatus.MonitorDeviceName):
-                    LiveStates.LyricsWindowStatus.UpdateMonitorBounds();
-                    if (LiveStates.LyricsWindowStatus.IsWorkArea)
-                    {
-                        LiveStates.IsLyricsWindowStatusRefreshing = true;
-                        WindowHook.UpdateWorkArea<NowPlayingWindow>();
-                        LiveStates.IsLyricsWindowStatusRefreshing = false;
-                        WindowHook.MoveAndResize<NowPlayingWindow>(LiveStates.LyricsWindowStatus.GetWindowBoundsWhenWorkArea());
-                    }
-                    break;
-                case nameof(LyricsWindowStatus.IsShownInSwitchers):
-                    WindowHook.SetIsShowInSwitchers<NowPlayingWindow>(LiveStates.LyricsWindowStatus.IsShownInSwitchers);
-                    break;
-                case nameof(LyricsWindowStatus.IsAlwaysOnTop):
-                    WindowHook.SetIsAlwaysOnTop<NowPlayingWindow>(LiveStates.LyricsWindowStatus.IsAlwaysOnTop);
-                    break;
-                case nameof(LyricsWindowStatus.IsClickThrough):
-                    WindowHook.SetIsClickThrough<NowPlayingWindow>(LiveStates.LyricsWindowStatus.IsClickThrough);
-                    break;
-                case nameof(LyricsWindowStatus.IsBorderless):
-                    WindowHook.SetIsBorderless<NowPlayingWindow>(LiveStates.LyricsWindowStatus.IsBorderless);
-                    break;
-                case nameof(LyricsWindowStatus.WindowX):
-                    WindowHook.MoveAndResize<NowPlayingWindow>(LiveStates.LyricsWindowStatus.WindowBounds.WithX(LiveStates.LyricsWindowStatus.WindowX));
-                    break;
-                case nameof(LyricsWindowStatus.WindowY):
-                    WindowHook.MoveAndResize<NowPlayingWindow>(LiveStates.LyricsWindowStatus.WindowBounds.WithY(LiveStates.LyricsWindowStatus.WindowY));
-                    break;
-                case nameof(LyricsWindowStatus.WindowWidth):
-                    WindowHook.MoveAndResize<NowPlayingWindow>(LiveStates.LyricsWindowStatus.WindowBounds.WithWidth(LiveStates.LyricsWindowStatus.WindowWidth));
-                    break;
-                case nameof(LyricsWindowStatus.WindowHeight):
-                    WindowHook.MoveAndResize<NowPlayingWindow>(LiveStates.LyricsWindowStatus.WindowBounds.WithHeight(LiveStates.LyricsWindowStatus.WindowHeight));
-                    break;
-                case nameof(LyricsWindowStatus.TitleBarArea):
-                    WindowHook.SetTitleBarArea<NowPlayingWindow>(LiveStates.LyricsWindowStatus.TitleBarArea);
-                    break;
-                case nameof(LyricsWindowStatus.AutoShowOrHideWindow):
-                    WindowHook.SetLyricsWindowVisibilityByPlayingStatus(_dispatcherQueue);
-                    break;
-                default:
-                    break;
-            }
-        }
-
-        public void Receive(PropertyChangedMessage<LyricsWindowStatus> message)
-        {
-            if (message.Sender is LiveStates)
-            {
-                if (message.PropertyName == nameof(LiveStates.LyricsWindowStatus))
-                {
-                    message.OldValue.PropertyChanged -= LyricsWindowStatus_PropertyChanged;
-                    message.NewValue.PropertyChanged += LyricsWindowStatus_PropertyChanged;
-                    RefreshLyricsWindowStatus();
-                }
-            }
-        }
-    }
-}

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Services/LyricsSearchService/LyricsSearchService.cs

@@ -40,7 +40,7 @@ namespace BetterLyrics.WinUI3.Services.LyricsSearchService
             _lrcLibHttpClient = new();
             _lrcLibHttpClient.DefaultRequestHeaders.Add(
                 "User-Agent",
-                $"{Constants.App.AppName} {MetadataHelper.AppVersion} ({Constants.Link.GitHub})"
+                $"{Constants.App.AppName} {MetadataHelper.AppVersion} ({Constants.Link.BetterLyricsGitHub})"
             );
             _amllTtmlDbHttpClient = new();
             _appleMusic = new AppleMusic();

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Services/MediaSessionsService/IMediaSessionsService.cs

@@ -1,19 +1,17 @@
 // 2025/6/23 by Zhe Fang
 
-using BetterLyrics.WinUI3.Enums;
-using BetterLyrics.WinUI3.Events;
 using BetterLyrics.WinUI3.Models;
 using Microsoft.UI.Xaml.Media.Imaging;
 using System;
 using System.ComponentModel;
 using System.Threading.Tasks;
+using Windows.Graphics.Imaging;
+using Windows.UI;
 
 namespace BetterLyrics.WinUI3.Services.MediaSessionsService
 {
     public interface IMediaSessionsService : INotifyPropertyChanged
     {
-        event EventHandler<LyricsChangedEventArgs>? LyricsChanged;
-
         Task PlayAsync();
         Task PauseAsync();
         Task PreviousAsync();
@@ -22,9 +20,6 @@ namespace BetterLyrics.WinUI3.Services.MediaSessionsService
         Task ChangeLyricsLine(int index);
 
         void UpdateLyrics();
-        void UpdateTranslations();
-
-        void InitPlaybackShortcuts();
 
         MediaSourceProviderInfo? CurrentMediaSourceProviderInfo { get; }
 
@@ -34,9 +29,9 @@ namespace BetterLyrics.WinUI3.Services.MediaSessionsService
         LyricsData? CurrentLyricsData { get; }
 
         BitmapImage? AlbumArtBitmapImage { get; }
-        AlbumArtThemeColors AlbumArtThemeColors { get; }
 
-        TranslationSearchProvider? TranslationSearchProvider { get; }
+        AlbumArtThemeColors CalculateAlbumArtThemeColors(LyricsWindowStatus lyricsWindowStatus, Color backdropAccentColor);
+
         LyricsSearchResult? CurrentLyricsSearchResult { get; }
     }
 }

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Services/MediaSessionsService/MediaSessionsService.AlbumArtUpdater.cs

@@ -12,6 +12,7 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
+using Vanara.PInvoke;
 using Windows.Graphics.Imaging;
 using Windows.Storage.Streams;
 using Windows.UI;
@@ -21,13 +22,15 @@ namespace BetterLyrics.WinUI3.Services.MediaSessionsService
     public partial class MediaSessionsService : IMediaSessionsService
     {
         private readonly LatestOnlyTaskRunner _albumArtRefreshRunner = new();
+        
+        private List<Color> _lightAccentColorsMedianCut = Enumerable.Repeat(Colors.Black, 4).ToList();
+        private List<Color> _darkAccentColorsMedianCut = Enumerable.Repeat(Colors.Black, 4).ToList();
+        private List<Color> _lightAccentColorsOctTree = Enumerable.Repeat(Colors.Black, 4).ToList();
+        private List<Color> _darkAccentColorsOctTree = Enumerable.Repeat(Colors.Black, 4).ToList();
 
-        private Color _envColor = Colors.Transparent;
-        private List<Color> _lightAccentColors = Enumerable.Repeat(Colors.Black, 4).ToList();
-        private List<Color> _darkAccentColors = Enumerable.Repeat(Colors.Black, 4).ToList();
-
+        private BitmapDecoder? _albumArtBitmapDecoder = null;
+        
         [ObservableProperty][NotifyPropertyChangedRecipients] public partial BitmapImage? AlbumArtBitmapImage { get; set; }
-        [ObservableProperty][NotifyPropertyChangedRecipients] public partial AlbumArtThemeColors AlbumArtThemeColors { get; set; } = new();
 
         private void UpdateAlbumArt()
         {
@@ -47,8 +50,6 @@ namespace BetterLyrics.WinUI3.Services.MediaSessionsService
             IBuffer? buffer = await Task.Run(async () => await _albumArtSearchService.SearchAsync(CurrentSongInfo, _SMTCAlbumArtBuffer, token), token);
             if (token.IsCancellationRequested) return;
 
-            BitmapDecoder? decoder = null;
-
             if (buffer == null)
             {
                 using var placeHolderStream = await ImageHelper.GetAlbumArtPlaceholderAsync();
@@ -59,39 +60,55 @@ namespace BetterLyrics.WinUI3.Services.MediaSessionsService
                 buffer = tempBuffer;
             }
 
-            decoder = await ImageHelper.MakeSquareWithThemeColor(buffer, _liveStatesService.LiveStates.LyricsWindowStatus.LyricsBackgroundSettings.PaletteGeneratorType);
+            _albumArtBitmapDecoder = await ImageHelper.GetBitmapDecoder(buffer);
             if (token.IsCancellationRequested) return;
 
-            var lightPalette = await ImageHelper.GetAccentColorsAsync(decoder, 4, _liveStatesService.LiveStates.LyricsWindowStatus.LyricsBackgroundSettings.PaletteGeneratorType, false);
-            var darkPalette = await ImageHelper.GetAccentColorsAsync(decoder, 4, _liveStatesService.LiveStates.LyricsWindowStatus.LyricsBackgroundSettings.PaletteGeneratorType, true);
-            if (token.IsCancellationRequested) return;
+            _lightAccentColorsMedianCut = 
+                (await ImageHelper.GetAccentColorsAsync(_albumArtBitmapDecoder, 4, PaletteGeneratorType.MedianCut, false))
+                .Palette.Select(Helper.ColorHelper.FromVector3).ToList();
+            _darkAccentColorsMedianCut = 
+                (await ImageHelper.GetAccentColorsAsync(_albumArtBitmapDecoder, 4, PaletteGeneratorType.MedianCut, true))
+                .Palette.Select(Helper.ColorHelper.FromVector3).ToList();
+            _lightAccentColorsOctTree = 
+                (await ImageHelper.GetAccentColorsAsync(_albumArtBitmapDecoder, 4, PaletteGeneratorType.OctTree, false))
+                .Palette.Select(Helper.ColorHelper.FromVector3).ToList();
+            _darkAccentColorsOctTree = 
+                (await ImageHelper.GetAccentColorsAsync(_albumArtBitmapDecoder, 4, PaletteGeneratorType.OctTree, true))
+                .Palette.Select(Helper.ColorHelper.FromVector3).ToList();
 
             var bitmapImage = new BitmapImage();
             await bitmapImage.SetSourceAsync(ImageHelper.ToIRandomAccessStream(buffer));
             if (token.IsCancellationRequested) return;
 
-            _lightAccentColors = lightPalette.Palette.Select(Helper.ColorHelper.FromVector3).ToList();
-            _darkAccentColors = darkPalette.Palette.Select(Helper.ColorHelper.FromVector3).ToList();
-
-            UpdateAlbumArtThemeColors();
-
             AlbumArtBitmapImage = bitmapImage;
         }
 
-        private void UpdateAlbumArtThemeColors()
+        public AlbumArtThemeColors CalculateAlbumArtThemeColors(LyricsWindowStatus lyricsWindowStatus, Color backdropAccentColor)
         {
-            var status = _liveStatesService.LiveStates.LyricsWindowStatus;
+            var lightAccentColors = lyricsWindowStatus.LyricsBackgroundSettings.PaletteGeneratorType switch
+            {
+                PaletteGeneratorType.MedianCut => _lightAccentColorsMedianCut,
+                PaletteGeneratorType.OctTree => _lightAccentColorsOctTree,
+                _ => _lightAccentColorsMedianCut,
+            };
+            var darkAccentColors = lyricsWindowStatus.LyricsBackgroundSettings.PaletteGeneratorType switch
+            {
+                PaletteGeneratorType.MedianCut => _darkAccentColorsMedianCut,
+                PaletteGeneratorType.OctTree => _darkAccentColorsOctTree,
+                _ => _darkAccentColorsMedianCut,
+            };
+
             var result = new AlbumArtThemeColors();
-            result.EnvColor = _envColor;
+            result.EnvColor = backdropAccentColor;
 
             ElementTheme themeTypeSent;
-            if (status.IsAdaptToEnvironment)
+            if (lyricsWindowStatus.IsAdaptToEnvironment)
             {
                 themeTypeSent = Helper.ColorHelper.GetElementThemeFromBackgroundColor(result.EnvColor);
             }
             else
             {
-                themeTypeSent = status.LyricsBackgroundSettings.LyricsBackgroundTheme;
+                themeTypeSent = lyricsWindowStatus.LyricsBackgroundSettings.LyricsBackgroundTheme;
             }
 
             bool isLight = themeTypeSent switch
@@ -115,10 +132,10 @@ namespace BetterLyrics.WinUI3.Services.MediaSessionsService
                 // brightness = 0.7f;
                 grayedEnvironmentalColor = lightColor;
 
-                result.AccentColor1 = _lightAccentColors.ElementAtOrDefault(0);
-                result.AccentColor2 = _lightAccentColors.ElementAtOrDefault(1);
-                result.AccentColor3 = _lightAccentColors.ElementAtOrDefault(2);
-                result.AccentColor4 = _lightAccentColors.ElementAtOrDefault(3);
+                result.AccentColor1 = lightAccentColors.ElementAtOrDefault(0);
+                result.AccentColor2 = lightAccentColors.ElementAtOrDefault(1);
+                result.AccentColor3 = lightAccentColors.ElementAtOrDefault(2);
+                result.AccentColor4 = lightAccentColors.ElementAtOrDefault(3);
             }
             else
             {
@@ -126,78 +143,53 @@ namespace BetterLyrics.WinUI3.Services.MediaSessionsService
                 // brightness = 0.3f;
                 grayedEnvironmentalColor = darkColor;
 
-                result.AccentColor1 = _darkAccentColors.ElementAtOrDefault(0);
-                result.AccentColor2 = _darkAccentColors.ElementAtOrDefault(1);
-                result.AccentColor3 = _darkAccentColors.ElementAtOrDefault(2);
-                result.AccentColor4 = _darkAccentColors.ElementAtOrDefault(3);
+                result.AccentColor1 = darkAccentColors.ElementAtOrDefault(0);
+                result.AccentColor2 = darkAccentColors.ElementAtOrDefault(1);
+                result.AccentColor3 = darkAccentColors.ElementAtOrDefault(2);
+                result.AccentColor4 = darkAccentColors.ElementAtOrDefault(3);
             }
 
-            if (status.IsAdaptToEnvironment)
+            if (lyricsWindowStatus.IsAdaptToEnvironment)
             {
                 adaptiveColoredFontColor = Helper.ColorHelper.GetForegroundColor(result.EnvColor);
             }
             else
             {
                 if (isLight)
-                    adaptiveColoredFontColor = _darkAccentColors.ElementAtOrDefault(0);
+                    adaptiveColoredFontColor = darkAccentColors.ElementAtOrDefault(0);
                 else
-                    adaptiveColoredFontColor = _lightAccentColors.ElementAtOrDefault(0);
+                    adaptiveColoredFontColor = lightAccentColors.ElementAtOrDefault(0);
             }
 
             result.ThemeType = themeTypeSent;
 
             // 背景字色
-            switch (status.LyricsStyleSettings.LyricsBgFontColorType)
+            result.BgFontColor = lyricsWindowStatus.LyricsStyleSettings.LyricsBgFontColorType switch
             {
-                case LyricsFontColorType.AdaptiveGrayed:
-                    result.BgFontColor = adaptiveGrayedFontColor;
-                    break;
-                case LyricsFontColorType.AdaptiveColored:
-                    result.BgFontColor = adaptiveColoredFontColor ?? adaptiveGrayedFontColor;
-                    break;
-                case LyricsFontColorType.Custom:
-                    result.BgFontColor = status.LyricsStyleSettings.LyricsCustomBgFontColor;
-                    break;
-                default:
-                    result.BgFontColor = adaptiveGrayedFontColor;
-                    break;
-            }
+                LyricsFontColorType.AdaptiveGrayed => adaptiveGrayedFontColor,
+                LyricsFontColorType.AdaptiveColored => adaptiveColoredFontColor ?? adaptiveGrayedFontColor,
+                LyricsFontColorType.Custom => lyricsWindowStatus.LyricsStyleSettings.LyricsCustomBgFontColor,
+                _ => adaptiveGrayedFontColor,
+            };
 
             // 前景字色
-            switch (status.LyricsStyleSettings.LyricsFgFontColorType)
+            result.FgFontColor = lyricsWindowStatus.LyricsStyleSettings.LyricsFgFontColorType switch
             {
-                case LyricsFontColorType.AdaptiveGrayed:
-                    result.FgFontColor = adaptiveGrayedFontColor;
-                    break;
-                case LyricsFontColorType.AdaptiveColored:
-                    result.FgFontColor = adaptiveColoredFontColor ?? adaptiveGrayedFontColor;
-                    break;
-                case LyricsFontColorType.Custom:
-                    result.FgFontColor = status.LyricsStyleSettings.LyricsCustomFgFontColor;
-                    break;
-                default:
-                    result.FgFontColor = adaptiveGrayedFontColor;
-                    break;
-            }
+                LyricsFontColorType.AdaptiveGrayed => adaptiveGrayedFontColor,
+                LyricsFontColorType.AdaptiveColored => adaptiveColoredFontColor ?? adaptiveGrayedFontColor,
+                LyricsFontColorType.Custom => lyricsWindowStatus.LyricsStyleSettings.LyricsCustomFgFontColor,
+                _ => adaptiveGrayedFontColor,
+            };
 
             // 描边颜色
-            switch (status.LyricsStyleSettings.LyricsStrokeFontColorType)
+            result.StrokeFontColor = lyricsWindowStatus.LyricsStyleSettings.LyricsStrokeFontColorType switch
             {
-                case LyricsFontColorType.AdaptiveGrayed:
-                    result.StrokeFontColor = grayedEnvironmentalColor.WithBrightness(0.7);
-                    break;
-                case LyricsFontColorType.AdaptiveColored:
-                    result.StrokeFontColor = result.EnvColor.WithBrightness(0.7);
-                    break;
-                case LyricsFontColorType.Custom:
-                    result.StrokeFontColor = status.LyricsStyleSettings.LyricsCustomStrokeFontColor;
-                    break;
-                default:
-                    result.StrokeFontColor = Colors.Transparent;
-                    break;
-            }
-
-            AlbumArtThemeColors = result;
+                LyricsFontColorType.AdaptiveGrayed => grayedEnvironmentalColor.WithBrightness(0.7),
+                LyricsFontColorType.AdaptiveColored => result.EnvColor.WithBrightness(0.7),
+                LyricsFontColorType.Custom => lyricsWindowStatus.LyricsStyleSettings.LyricsCustomStrokeFontColor,
+                _ => Colors.Transparent,
+            };
+            return result;
         }
 
     }

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Services/MediaSessionsService/MediaSessionsService.LyricsUpdater.cs

@@ -1,16 +1,9 @@
-using BetterLyrics.WinUI3.Enums;
-using BetterLyrics.WinUI3.Events;
-using BetterLyrics.WinUI3.Extensions;
+using BetterLyrics.WinUI3.Extensions;
 using BetterLyrics.WinUI3.Helper;
 using BetterLyrics.WinUI3.Models;
 using BetterLyrics.WinUI3.Parsers.LyricsParser;
 using CommunityToolkit.Mvvm.ComponentModel;
-using Lyricify.Lyrics.Helpers.General;
 using Microsoft.Extensions.Logging;
-using Microsoft.UI.Xaml.Controls;
-using System;
-using System.Collections.Generic;
-using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
 
@@ -19,188 +12,50 @@ namespace BetterLyrics.WinUI3.Services.MediaSessionsService
     public partial class MediaSessionsService : IMediaSessionsService
     {
         private LatestOnlyTaskRunner _refreshLyricsRunner = new();
-        private LatestOnlyTaskRunner _refreshTranslationRunner = new();
-
-        private int _langIndex = 0;
-        private List<LyricsData> _lyricsDataArr = [];
 
         [ObservableProperty][NotifyPropertyChangedRecipients] public partial LyricsData? CurrentLyricsData { get; private set; }
 
-        public event EventHandler<LyricsChangedEventArgs>? LyricsChanged;
-
         [ObservableProperty] public partial LyricsSearchResult? CurrentLyricsSearchResult { get; private set; }
 
-        [ObservableProperty][NotifyPropertyChangedRecipients] public partial TranslationSearchProvider? TranslationSearchProvider { get; private set; }
-
-        [ObservableProperty] public partial bool IsTranslating { get; set; } = false;
-
-        private void SetCurrentLyricsData()
-        {
-            CurrentLyricsData = _lyricsDataArr.ElementAtOrDefault(_langIndex);
-        }
-
-        private async Task RefreshTranslationAsync(CancellationToken token)
-        {
-            TranslationSearchProvider = null;
-            _lyricsDataArr.ElementAtOrDefault(0)?.ClearTranslatedText();
-
-            App.Current.Resources.DispatcherQueue.TryEnqueue(SetCurrentLyricsData);
-
-            IsTranslating = true;
-
-            await SetPhoneticTextAsync(token);
-            await SetTranslatedTextAsync(token);
-            if (token.IsCancellationRequested) return;
-
-            IsTranslating = false;
-
-            App.Current.Resources.DispatcherQueue.TryEnqueue(SetCurrentLyricsData);
-
-        }
-
-        private async Task SetTranslatedTextAsync(CancellationToken token)
-        {
-            if (!_settingsService.AppSettings.TranslationSettings.IsTranslationEnabled) return;
-
-            _logger.LogInformation("SetTranslatedTextAsync");
-            string targetLangCode = _settingsService.AppSettings.TranslationSettings.SelectedTargetLanguageCode;
-            _logger.LogInformation("Target language code: {TargetLangCode}", targetLangCode);
-            string? originalText = _lyricsDataArr.FirstOrDefault()?.WrappedOriginalText;
-            if (originalText == null) return;
-
-            string? originalLangCode = LanguageHelper.DetectLanguageCode(originalText);
-            _logger.LogInformation("Original language code: {OriginalLangCode}", originalLangCode);
-
-            if (originalLangCode == targetLangCode)
-            {
-                _logger.LogInformation("Original lyrics already in target language: {TargetLangCode}", targetLangCode);
-
-                _lyricsDataArr.FirstOrDefault()?.ClearTranslatedText();
-            }
-            else
-            {
-                // Try get translation from itself first
-                int found = _translateService.SearchTranslatedLyricsItself(_lyricsDataArr, targetLangCode);
-                if (found >= 0)
-                {
-                    _logger.LogInformation("Found translated text in lyrics data at index {FoundIndex}", found);
-
-                    _lyricsDataArr.FirstOrDefault()?.SetTranslatedText(_lyricsDataArr[found], 50);
-                    TranslationSearchProvider = CurrentLyricsSearchResult?.Provider.ToTranslationSearchProvider();
-                }
-                else if (_settingsService.AppSettings.TranslationSettings.IsLibreTranslateEnabled)
-                {
-                    _logger.LogInformation("LibreTranslate is enabled, trying to translate lyrics...");
-                    string translated = string.Empty;
-                    try
-                    {
-                        translated = await _translateService.TranslateTextAsync(originalText, targetLangCode, token);
-                        if (token.IsCancellationRequested) return;
-                        if (translated == string.Empty) return;
-
-                        _lyricsDataArr.FirstOrDefault()?.SetTranslation(translated);
-
-                        TranslationSearchProvider = Enums.TranslationSearchProvider.LibreTranslate;
-                    }
-                    catch (Exception)
-                    {
-                        ToastHelper.ShowToast("LibreTranslateFailed", null, InfoBarSeverity.Error);
-                    }
-                }
-            }
-        }
-
-        private async Task SetPhoneticTextAsync(CancellationToken token)
-        {
-            _logger.LogInformation("Showing phonetic text for lyrics...");
-            string targetPhoneticCode = "";
-            _logger.LogInformation("Target phonetic code: {TargetPhonetic}", targetPhoneticCode);
-            string? originalText = _lyricsDataArr.FirstOrDefault()?.WrappedOriginalText;
-            if (originalText == null) return;
-
-            string? originalLangCode = LanguageHelper.DetectLanguageCode(originalText);
-            _logger.LogInformation("Original phonetic code: {OriginalLangCode}", originalLangCode);
-
-            if (originalLangCode == "zh" && _settingsService.AppSettings.TranslationSettings.IsChineseRomanizationEnabled)
-            {
-                targetPhoneticCode = _settingsService.AppSettings.TranslationSettings.ChineseRomanization.ToPhoneticCode();
-            }
-            else if (originalLangCode == "ja" && _settingsService.AppSettings.TranslationSettings.IsJapaneseRomanizationEnabled)
-            {
-                targetPhoneticCode = PhoneticHelper.RomanCode;
-            }
-
-            if (targetPhoneticCode == "")
-            {
-                _lyricsDataArr.FirstOrDefault()?.ClearPhoneticText();
-            }
-
-            // Try get phonetic text from itself
-            int found = _translateService.SearchTranslatedLyricsItself(_lyricsDataArr, targetPhoneticCode);
-            if (found >= 0)
-            {
-                _logger.LogInformation("Found phonetic text in lyrics data at index {FoundIndex}", found);
-                _lyricsDataArr.FirstOrDefault()?.SetPhoneticText(_lyricsDataArr[found], 50);
-            }
-
-        }
-
         private async Task RefreshLyricsAsync(CancellationToken token)
         {
             _logger.LogInformation("RefreshLyricsAsync");
 
             CurrentLyricsSearchResult = null;
-            _lyricsDataArr = [LyricsData.GetLoadingPlaceholder()];
-
-            App.Current.Resources.DispatcherQueue.TryEnqueue(SetCurrentLyricsData);
+            CurrentLyricsData = LyricsData.GetLoadingPlaceholder();
 
             if (CurrentSongInfo != null)
             {
                 CurrentLyricsSearchResult = await Task.Run(async () => await _lyrcsSearchService.SearchSmartlyAsync(
                     CurrentSongInfo,
-                    !_settingsService.AppSettings.GeneralSettings.IgnoreCacheWhenSearching,
+                    true,
                     CurrentMediaSourceProviderInfo?.LyricsSearchType,
                     token),
                 token);
                 if (token.IsCancellationRequested) return;
 
-                var lyricsParser = new LyricsParser();
-                lyricsParser.Parse(CurrentSongInfo, CurrentLyricsSearchResult);
-                _lyricsDataArr = lyricsParser.LyricsDataArr;
-                ApplyChinesePreference();
-            }
-
-            _logger.LogInformation("Parsed lyrics: {MultiLangLyricsCount} languages", _lyricsDataArr.Count);
-
-            // Show original first while loading phonetic and translated
-            ApplyChinesePreference();
-
-            App.Current.Resources.DispatcherQueue.TryEnqueue(SetCurrentLyricsData);
-
-            UpdateTranslations();
-        }
-
-        private void ApplyChinesePreference()
-        {
-            var traditionalChinesePreferred = _settingsService.AppSettings.TranslationSettings.IsTraditionalChineseEnabled;
-            var found = _lyricsDataArr.FindIndex(x => x.LanguageCode == "zh");
-            if (found >= 0)
-            {
-                foreach (var item in _lyricsDataArr[found].LyricsLines)
+                if (CurrentLyricsSearchResult != null)
                 {
-                    item.OriginalText = traditionalChinesePreferred ? ChineseHelper.ToTC(item.OriginalText) : ChineseHelper.ToSC(item.OriginalText);
+                    var lyricsParser = new LyricsParser();
+
+                    (CurrentLyricsData, CurrentLyricsSearchResult.TransliterationProvider, CurrentLyricsSearchResult.TranslationProvider) =
+                        await Task.Run(async () => await lyricsParser.Parse(
+                            _translateService,
+                            _settingsService.AppSettings.TranslationSettings,
+                            CurrentLyricsSearchResult,
+                            token),
+                    token);
                 }
             }
         }
 
-        public void UpdateLyrics()
+        public async void UpdateLyrics()
         {
-            _ = _refreshLyricsRunner.RunAsync(RefreshLyricsAsync);
+            await _refreshLyricsRunner.RunAsync(async (token) =>
+            {
+                await RefreshLyricsAsync(token);
+            });
         }
 
-        public void UpdateTranslations()
-        {
-            _ = _refreshTranslationRunner.RunAsync(RefreshTranslationAsync);
-        }
     }
 }

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Services/MediaSessionsService/MediaSessionsService.cs

@@ -12,7 +12,6 @@ using BetterLyrics.WinUI3.Models.Settings;
 using BetterLyrics.WinUI3.Services.AlbumArtSearchService;
 using BetterLyrics.WinUI3.Services.DiscordService;
 using BetterLyrics.WinUI3.Services.LibWatcherService;
-using BetterLyrics.WinUI3.Services.LiveStatesService;
 using BetterLyrics.WinUI3.Services.LyricsSearchService;
 using BetterLyrics.WinUI3.Services.SettingsService;
 using BetterLyrics.WinUI3.Services.TranslateService;
@@ -25,10 +24,8 @@ using CommunityToolkit.WinUI;
 using EvtSource;
 using Microsoft.Extensions.Logging;
 using Microsoft.UI.Dispatching;
-using Microsoft.UI.Xaml;
 using Microsoft.UI.Xaml.Controls;
 using System;
-using System.Collections.Generic;
 using System.Linq;
 using System.Runtime.InteropServices.WindowsRuntime;
 using System.Text.Json;
@@ -36,7 +33,6 @@ using System.Threading.Tasks;
 using Vanara.Windows.Shell;
 using Windows.Media.Control;
 using Windows.Storage.Streams;
-using Windows.UI;
 using WindowsMediaController;
 
 namespace BetterLyrics.WinUI3.Services.MediaSessionsService
@@ -44,13 +40,7 @@ namespace BetterLyrics.WinUI3.Services.MediaSessionsService
     public partial class MediaSessionsService : BaseViewModel, IMediaSessionsService,
         IRecipient<PropertyChangedMessage<bool>>,
         IRecipient<PropertyChangedMessage<string>>,
-        IRecipient<PropertyChangedMessage<LyricsWindowStatus>>,
-        IRecipient<PropertyChangedMessage<PaletteGeneratorType>>,
-        IRecipient<PropertyChangedMessage<ChineseRomanization>>,
-        IRecipient<PropertyChangedMessage<List<string>>>,
-        IRecipient<PropertyChangedMessage<Color>>,
-        IRecipient<PropertyChangedMessage<ElementTheme>>,
-        IRecipient<PropertyChangedMessage<LyricsFontColorType>>
+        IRecipient<PropertyChangedMessage<ChineseRomanization>>
     {
         private EventSourceReader? _sse = null;
         private readonly MediaManager _mediaManager = new();
@@ -61,7 +51,6 @@ namespace BetterLyrics.WinUI3.Services.MediaSessionsService
         private readonly ITranslateService _translateService;
         private readonly ISettingsService _settingsService;
         private readonly ILibWatcherService _libWatcherService;
-        private readonly ILiveStatesService _liveStatesService;
         private readonly IDiscordService _discordService;
         private readonly ILogger<MediaSessionsService> _logger;
 
@@ -79,19 +68,17 @@ namespace BetterLyrics.WinUI3.Services.MediaSessionsService
         public MediaSessionsService(
             ISettingsService settingsService,
             IAlbumArtSearchService albumArtSearchService,
-            ILyricsSearchService musicSearchService,
+            ILyricsSearchService lyricsSearchService,
             ILibWatcherService libWatcherService,
-            ILiveStatesService liveStatesService,
             IDiscordService discordService,
             ITranslateService libreTranslateService,
             ILogger<MediaSessionsService> logger)
         {
             _settingsService = settingsService;
             _albumArtSearchService = albumArtSearchService;
-            _lyrcsSearchService = musicSearchService;
+            _lyrcsSearchService = lyricsSearchService;
             _libWatcherService = libWatcherService;
             _translateService = libreTranslateService;
-            _liveStatesService = liveStatesService;
             _discordService = discordService;
             _logger = logger;
 
@@ -108,7 +95,6 @@ namespace BetterLyrics.WinUI3.Services.MediaSessionsService
             _libWatcherService.MusicLibraryFilesChanged += LibWatcherService_MusicLibraryFilesChanged;
 
             InitMediaManager();
-            InitPlaybackShortcuts();
         }
 
         private void MappedSongSearchQueries_ItemPropertyChanged(object? sender, ItemPropertyChangedEventArgs e)
@@ -121,44 +107,6 @@ namespace BetterLyrics.WinUI3.Services.MediaSessionsService
             UpdateLyrics();
         }
 
-        public void InitPlaybackShortcuts()
-        {
-            UpdatePlayOrPauseSongShortcut();
-            UpdatePreviousSongShortcut();
-            UpdateNextSongShortcut();
-        }
-
-        private void UpdatePlayOrPauseSongShortcut()
-        {
-            GlobalHotKeyHook.UpdateHotKey<NowPlayingWindow>(ShortcutID.PlayOrPauseSong, _settingsService.AppSettings.GeneralSettings.PlayOrPauseShortcut, (() =>
-            {
-                if (CurrentIsPlaying)
-                {
-                    _ = PauseAsync();
-                }
-                else
-                {
-                    _ = PlayAsync();
-                }
-            }));
-        }
-
-        private void UpdatePreviousSongShortcut()
-        {
-            GlobalHotKeyHook.UpdateHotKey<NowPlayingWindow>(ShortcutID.PreviousSong, _settingsService.AppSettings.GeneralSettings.PreviousSongShortcut, () =>
-            {
-                _ = PreviousAsync();
-            });
-        }
-
-        private void UpdateNextSongShortcut()
-        {
-            GlobalHotKeyHook.UpdateHotKey<NowPlayingWindow>(ShortcutID.NextSong, _settingsService.AppSettings.GeneralSettings.NextSongShortcut, () =>
-            {
-                _ = NextAsync();
-            });
-        }
-
         private void LocalMediaFolders_ItemPropertyChanged(object? sender, ItemPropertyChangedEventArgs e)
         {
             UpdateAlbumArt();
@@ -206,7 +154,22 @@ namespace BetterLyrics.WinUI3.Services.MediaSessionsService
 
         private bool IsMediaSourceEnabled(string id)
         {
-            return _settingsService.AppSettings.MediaSourceProvidersInfo.FirstOrDefault(s => s.Provider == id)?.IsEnabled ?? true;
+            var found = _settingsService.AppSettings.MediaSourceProvidersInfo.FirstOrDefault(s => s.Provider == id);
+            if (_settingsService.AppSettings.MusicGallerySettings.LyricsWindowStatus.IsOpened)
+            {
+                if (PlayerIDHelper.IsBetterLyrics(found?.Provider))
+                {
+                    return found?.IsEnabled ?? true;
+                }
+                else
+                {
+                    return false;
+                }
+            }
+            else
+            {
+                return found?.IsEnabled ?? true;
+            }
         }
 
         private bool IsMediaSourceTimelineSyncEnabled(string? id)
@@ -239,7 +202,11 @@ namespace BetterLyrics.WinUI3.Services.MediaSessionsService
         private void MediaManager_OnAnyTimelinePropertyChanged(MediaManager.MediaSession? mediaSession, GlobalSystemMediaTransportControlsSessionTimelineProperties? timelineProperties)
         {
             if (!_mediaManager.IsStarted) return;
-            if (mediaSession == null) return;
+            if (mediaSession == null)
+            {
+                CurrentPosition = TimeSpan.Zero;
+                return;
+            }
 
             var desiredSession = GetCurrentSession();
 
@@ -263,7 +230,11 @@ namespace BetterLyrics.WinUI3.Services.MediaSessionsService
             _dispatcherQueue.TryEnqueue(DispatcherQueuePriority.Low, (() =>
             {
                 if (!_mediaManager.IsStarted) return;
-                if (mediaSession == null) return;
+                if (mediaSession == null)
+                {
+                    CurrentIsPlaying = false;
+                    return;
+                }
 
                 var desiredSession = GetCurrentSession();
 
@@ -501,14 +472,12 @@ namespace BetterLyrics.WinUI3.Services.MediaSessionsService
             GlobalSystemMediaTransportControlsSessionMediaProperties? mediaProps = null;
 
             var desiredSession = GetCurrentSession();
-            //if (desiredSession == null || desiredSession.ControlSession == null) return;
 
             try
             {
                 mediaProps = await desiredSession?.ControlSession?.TryGetMediaPropertiesAsync();
             }
             catch (Exception) { }
-            //if (desiredSession == null || desiredSession.ControlSession == null) return;
 
             MediaManager_OnAnyTimelinePropertyChanged(desiredSession, desiredSession?.ControlSession?.GetTimelineProperties());
             MediaManager_OnAnyMediaPropertyChanged(desiredSession, mediaProps);
@@ -690,42 +659,30 @@ namespace BetterLyrics.WinUI3.Services.MediaSessionsService
             {
                 if (message.PropertyName == nameof(TranslationSettings.IsLibreTranslateEnabled))
                 {
-                    UpdateTranslations();
+                    UpdateLyrics();
                 }
                 else if (message.PropertyName == nameof(TranslationSettings.IsTranslationEnabled))
                 {
-                    UpdateTranslations();
+                    UpdateLyrics();
                 }
                 else if (message.PropertyName == nameof(TranslationSettings.IsChineseRomanizationEnabled))
                 {
-                    UpdateTranslations();
+                    UpdateLyrics();
                 }
                 else if (message.PropertyName == nameof(TranslationSettings.IsJapaneseRomanizationEnabled))
                 {
-                    UpdateTranslations();
+                    UpdateLyrics();
                 }
                 else if (message.PropertyName == nameof(TranslationSettings.IsTraditionalChineseEnabled))
                 {
                     UpdateLyrics();
                 }
             }
-        }
-
-        public void Receive(PropertyChangedMessage<List<string>> message)
-        {
-            if (message.Sender is GeneralSettings)
+            else if (message.Sender is LyricsWindowStatus)
             {
-                if (message.PropertyName == nameof(GeneralSettings.PlayOrPauseShortcut))
+                if (message.PropertyName == nameof(MusicGallerySettings.LyricsWindowStatus.IsOpened))
                 {
-                    UpdatePlayOrPauseSongShortcut();
-                }
-                else if (message.PropertyName == nameof(GeneralSettings.PreviousSongShortcut))
-                {
-                    UpdatePreviousSongShortcut();
-                }
-                else if (message.PropertyName == nameof(GeneralSettings.NextSongShortcut))
-                {
-                    UpdateNextSongShortcut();
+                    MediaManager_OnFocusedSessionChanged(null);
                 }
             }
         }
@@ -737,101 +694,22 @@ namespace BetterLyrics.WinUI3.Services.MediaSessionsService
                 if (message.PropertyName == nameof(TranslationSettings.SelectedTargetLanguageCode))
                 {
                     _logger.LogInformation("Target LibreTranslate language code changed: {code}", _settingsService.AppSettings.TranslationSettings.SelectedTargetLanguageCode);
-                    UpdateTranslations();
+                    UpdateLyrics();
                 }
             }
 
         }
 
-        public void Receive(PropertyChangedMessage<LyricsWindowStatus> message)
-        {
-            if (message.Sender is LiveStates)
-            {
-                if (message.PropertyName == nameof(LiveStates.LyricsWindowStatus))
-                {
-                    UpdateAlbumArtThemeColors();
-                    UpdateTranslations();
-                }
-            }
-        }
-
         public void Receive(PropertyChangedMessage<ChineseRomanization> message)
         {
             if (message.Sender is TranslationSettings)
             {
                 if (message.PropertyName == nameof(TranslationSettings.ChineseRomanization))
                 {
-                    UpdateTranslations();
+                    UpdateLyrics();
                 }
             }
         }
 
-        public void Receive(PropertyChangedMessage<PaletteGeneratorType> message)
-        {
-            if (message.Sender is LyricsBackgroundSettings)
-            {
-                if (message.PropertyName == nameof(LyricsBackgroundSettings.PaletteGeneratorType))
-                {
-                    UpdateAlbumArt();
-                }
-            }
-        }
-
-        public void Receive(PropertyChangedMessage<Color> message)
-        {
-            if (message.Sender is NowPlayingWindowViewModel)
-            {
-                if (message.PropertyName == nameof(NowPlayingWindowViewModel.BackdropAccentColor))
-                {
-                    _envColor = message.NewValue;
-                    UpdateAlbumArtThemeColors();
-                }
-            }
-            else if (message.Sender is LyricsStyleSettings)
-            {
-                if (message.PropertyName == nameof(LyricsStyleSettings.LyricsCustomBgFontColor))
-                {
-                    UpdateAlbumArtThemeColors();
-                }
-                else if (message.PropertyName == nameof(LyricsStyleSettings.LyricsCustomFgFontColor))
-                {
-                    UpdateAlbumArtThemeColors();
-                }
-                else if (message.PropertyName == nameof(LyricsStyleSettings.LyricsCustomStrokeFontColor))
-                {
-                    UpdateAlbumArtThemeColors();
-                }
-            }
-        }
-
-        public void Receive(PropertyChangedMessage<ElementTheme> message)
-        {
-            if (message.Sender is LyricsBackgroundSettings)
-            {
-                if (message.PropertyName == nameof(LyricsBackgroundSettings.LyricsBackgroundTheme))
-                {
-                    UpdateAlbumArtThemeColors();
-                }
-            }
-        }
-
-        public void Receive(PropertyChangedMessage<LyricsFontColorType> message)
-        {
-            if (message.Sender is LyricsStyleSettings)
-            {
-                if (message.PropertyName == nameof(LyricsStyleSettings.LyricsBgFontColorType))
-                {
-                    UpdateAlbumArtThemeColors();
-                }
-                else if (message.PropertyName == nameof(LyricsStyleSettings.LyricsFgFontColorType))
-                {
-                    UpdateAlbumArtThemeColors();
-                }
-                else if (message.PropertyName == nameof(LyricsStyleSettings.LyricsStrokeFontColorType))
-                {
-                    UpdateAlbumArtThemeColors();
-                }
-            }
-        }
     }
 }

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Services/SettingsService/SettingsService.cs

@@ -2,6 +2,7 @@
 
 using BetterLyrics.WinUI3.Collections;
 using BetterLyrics.WinUI3.Enums;
+using BetterLyrics.WinUI3.Extensions;
 using BetterLyrics.WinUI3.Helper;
 using BetterLyrics.WinUI3.Models;
 using BetterLyrics.WinUI3.Models.Settings;
@@ -19,7 +20,7 @@ namespace BetterLyrics.WinUI3.Services.SettingsService
     // 新建一个 AppSettings 类
     public partial class SettingsService : BaseViewModel, ISettingsService
     {
-        private DispatcherQueueTimer _writeAppSettingsTimer;
+        private readonly DispatcherQueueTimer _writeAppSettingsTimer;
 
         public AppSettings AppSettings { get; set; }
 

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Strings/en-US/Resources.resw

@@ -153,9 +153,6 @@
   <data name="DemoWindowControlDefault.Text" xml:space="preserve">
     <value>Default</value>
   </data>
-  <data name="DependenciesSettingsExpander.Header" xml:space="preserve">
-    <value>Dependencies</value>
-  </data>
   <data name="DesktopMode" xml:space="preserve">
     <value>Desktop mode (transparent)</value>
   </data>
@@ -198,6 +195,9 @@
   <data name="Jyutping" xml:space="preserve">
     <value>Cantonese pinyin</value>
   </data>
+  <data name="KeepAtLeastOneStatusDefault" xml:space="preserve">
+    <value>Please make sure at least one status is set to default</value>
+  </data>
   <data name="LastFMAuthFailed" xml:space="preserve">
     <value>Authorization failed, please try again</value>
   </data>
@@ -240,22 +240,22 @@
   <data name="LyricsPageLyricsProviderPrefix.Header" xml:space="preserve">
     <value>Lyrics provider</value>
   </data>
-  <data name="LyricsPageLyricsSearchButtonToolTip.Content" xml:space="preserve">
+  <data name="LyricsPageLyricsSearch.Text" xml:space="preserve">
     <value>Manually search lyrics</value>
   </data>
-  <data name="LyricsPageLyricsSettingsButtonToolTip.Content" xml:space="preserve">
+  <data name="LyricsPageLyricsSettings.Text" xml:space="preserve">
     <value>Lyrics Window Management Shortcut Settings</value>
   </data>
   <data name="LyricsPageMatchPercentage.Header" xml:space="preserve">
     <value>Match percentage</value>
   </data>
-  <data name="LyricsPagePlaybackSourceButtonToolTip.Content" xml:space="preserve">
+  <data name="LyricsPagePlaybackSource.Text" xml:space="preserve">
     <value>Play source shortcut settings</value>
   </data>
   <data name="LyricsPagePositionOffsetHint.Header" xml:space="preserve">
     <value>Reset to 0 when switching songs</value>
   </data>
-  <data name="LyricsPageSettingsButtonToolTip.Content" xml:space="preserve">
+  <data name="LyricsPageSettings.Text" xml:space="preserve">
     <value>Settings</value>
   </data>
   <data name="LyricsPageTimelineOffsetButtonToolTip.Content" xml:space="preserve">
@@ -276,6 +276,9 @@
   <data name="LyricsPageTranslationProviderPrefix.Header" xml:space="preserve">
     <value>Translation provider</value>
   </data>
+  <data name="LyricsPageTransliterationProviderPrefix.Header" xml:space="preserve">
+    <value>Transliteration source</value>
+  </data>
   <data name="LyricsParseError" xml:space="preserve">
     <value>Lyrics parsing failed</value>
   </data>
@@ -342,8 +345,8 @@
   <data name="LyricsWindowImmersiveButtonToolTip.Content" xml:space="preserve">
     <value>Immersive mode</value>
   </data>
-  <data name="LyricsWindowSettingsControlCurrentLyricsWindowConfig.Text" xml:space="preserve">
-    <value>Current lyrics window config</value>
+  <data name="LyricsWindowSettingsControlLyricsWindowConfig.Text" xml:space="preserve">
+    <value>Configuration</value>
   </data>
   <data name="LyricsWindowSettingsControlLyricsWindowMode.Header" xml:space="preserve">
     <value>Lyrics window mode</value>
@@ -487,7 +490,7 @@
     <value>Single loop</value>
   </data>
   <data name="MusicGalleryPageSongSearchBox.PlaceholderText" xml:space="preserve">
-    <value>Search for song title, artist, album or folder path</value>
+    <value>Search for the song name, artist, album, file name, or folder path where the file is located</value>
   </data>
   <data name="MusicGalleryPageSortByAlbum.Content" xml:space="preserve">
     <value>Album</value>
@@ -513,6 +516,12 @@
   <data name="MusicGalleryPageTitle" xml:space="preserve">
     <value>Music gallery - BetterLyrics</value>
   </data>
+  <data name="MusicGalleryWindowDownButtonToolTip.Content" xml:space="preserve">
+    <value>Retract</value>
+  </data>
+  <data name="MusicGalleryWindowUpButtonToolTip.Content" xml:space="preserve">
+    <value>Unwrap</value>
+  </data>
   <data name="NarrowMode" xml:space="preserve">
     <value>Narrow mode</value>
   </data>
@@ -534,6 +543,9 @@
   <data name="SetingsPageContributors.Text" xml:space="preserve">
     <value>Contributors</value>
   </data>
+  <data name="SetingsPageDeps.Text" xml:space="preserve">
+    <value>Dependent package</value>
+  </data>
   <data name="SetingsPageDonation.Text" xml:space="preserve">
     <value>Donation</value>
   </data>
@@ -582,6 +594,9 @@
   <data name="SettingsPageAlbumArt.Text" xml:space="preserve">
     <value>Album art</value>
   </data>
+  <data name="SettingsPageAlbumArtHeight.Header" xml:space="preserve">
+    <value>Album image height</value>
+  </data>
   <data name="SettingsPageAlbumArtLayer.Header" xml:space="preserve">
     <value>Album art layer</value>
   </data>
@@ -591,6 +606,9 @@
   <data name="SettingsPageAlbumArtSize.Header" xml:space="preserve">
     <value>Album art size</value>
   </data>
+  <data name="SettingsPageAlbumEffect.Text" xml:space="preserve">
+    <value>Album art area effect</value>
+  </data>
   <data name="SettingsPageAlbumLib.Content" xml:space="preserve">
     <value>Album art source</value>
   </data>
@@ -633,6 +651,9 @@
   <data name="SettingsPageAutoAdjust.Header" xml:space="preserve">
     <value>Automatic adjustment</value>
   </data>
+  <data name="SettingsPageAutoOpenLyricsWindow.Header" xml:space="preserve">
+    <value>Automatically opens the default lyrics window when the program starts</value>
+  </data>
   <data name="SettingsPageAutoOpenMusicGalleryWindow.Header" xml:space="preserve">
     <value>Open the music library window when the app starts</value>
   </data>
@@ -654,9 +675,6 @@
   <data name="SettingsPageBackgroundOverlay.Text" xml:space="preserve">
     <value>Lyrics background</value>
   </data>
-  <data name="SettingsPageBlurAmount.Header" xml:space="preserve">
-    <value>Blur amount</value>
-  </data>
   <data name="SettingsPageBorderless.Header" xml:space="preserve">
     <value>Borderless window</value>
   </data>
@@ -702,6 +720,9 @@
   <data name="SettingsPageClickThroughHotKey.Header" xml:space="preserve">
     <value>Click-through shortcut keys</value>
   </data>
+  <data name="SettingsPageCloseStatus.Text" xml:space="preserve">
+    <value>Close</value>
+  </data>
   <data name="SettingsPageCollapseDropdown.Content" xml:space="preserve">
     <value>Collapse dropdown</value>
   </data>
@@ -714,12 +735,18 @@
   <data name="SettingsPageConfigName.Header" xml:space="preserve">
     <value>Configuration name</value>
   </data>
+  <data name="SettingsPageConfigPlaybackSource.Text" xml:space="preserve">
+    <value>Configure playback source</value>
+  </data>
   <data name="SettingsPageCreateFromCurrent.Text" xml:space="preserve">
     <value>Copy</value>
   </data>
   <data name="SettingsPageCreateFromTemplates.Content" xml:space="preserve">
     <value>Create from templates</value>
   </data>
+  <data name="SettingsPageCrossfade.Content" xml:space="preserve">
+    <value>Crossfade</value>
+  </data>
   <data name="SettingsPageCurrentLyricsWindowStatus.Text" xml:space="preserve">
     <value>Current lyrics window status</value>
   </data>
@@ -807,6 +834,12 @@
   <data name="SettingsPageEasingTypeSmoothStep.Content" xml:space="preserve">
     <value>Smooth step</value>
   </data>
+  <data name="SettingsPageEffectLineStartToCurrentChar.Content" xml:space="preserve">
+    <value>Line start to current char</value>
+  </data>
+  <data name="SettingsPageEffectScopeLongDurationSyllable.Content" xml:space="preserve">
+    <value>Long duration syllable</value>
+  </data>
   <data name="SettingsPageEN.Content" xml:space="preserve">
     <value>English</value>
   </data>
@@ -825,6 +858,9 @@
   <data name="SettingsPageEnvColorSampleInner.Content" xml:space="preserve">
     <value>Inside the window</value>
   </data>
+  <data name="SettingsPageExitOnGalleryWindowClosed.Header" xml:space="preserve">
+    <value>Exit the program when closing the music library window</value>
+  </data>
   <data name="SettingsPageExitOnLyricsWindowClosed.Header" xml:space="preserve">
     <value>Exit the program when you close the lyrics window</value>
   </data>
@@ -879,6 +915,9 @@
   <data name="SettingsPageHeight.Header" xml:space="preserve">
     <value>Height</value>
   </data>
+  <data name="SettingsPageHello.Text" xml:space="preserve">
+    <value>Hello</value>
+  </data>
   <data name="SettingsPageHideWindow.Description" xml:space="preserve">
     <value>Automatically hide/show lyric window when music is not playing</value>
   </data>
@@ -891,6 +930,9 @@
   <data name="SettingsPageHorizontalLayoutFactor.Text" xml:space="preserve">
     <value>Horizontal layout factor</value>
   </data>
+  <data name="SettingsPageImageSwitchType.Header" xml:space="preserve">
+    <value>Album art toggle animation</value>
+  </data>
   <data name="SettingsPageImport.Content" xml:space="preserve">
     <value>Import</value>
   </data>
@@ -978,6 +1020,9 @@
   <data name="SettingsPageLog.Header" xml:space="preserve">
     <value>Log record</value>
   </data>
+  <data name="SettingsPageLongSyllableDuration.Header" xml:space="preserve">
+    <value>Long syllable threshold</value>
+  </data>
   <data name="SettingsPageLXMusicServer.Header" xml:space="preserve">
     <value>LX Music Server</value>
   </data>
@@ -996,18 +1041,18 @@
   <data name="SettingsPageLyricsBlack.Content" xml:space="preserve">
     <value>Black</value>
   </data>
-  <data name="SettingsPageLyricsBlurAmount.Header" xml:space="preserve">
-    <value>Blur amount</value>
+  <data name="SettingsPageLyricsBlurEffect.Description" xml:space="preserve">
+    <value>Enable blur for non-current rows</value>
   </data>
-  <data name="SettingsPageLyricsBlurAmountSideEffect.Text" xml:space="preserve">
-    <value>Adjusting this value will also increase the background blur intensity of the album image.</value>
-  </data>
-  <data name="SettingsPageLyricsBlurHighGPUUsage.Text" xml:space="preserve">
-    <value>Significantly higher GPU usage when blur is enabled (&gt; 0)</value>
+  <data name="SettingsPageLyricsBlurEffect.Header" xml:space="preserve">
+    <value>Blur Effect</value>
   </data>
   <data name="SettingsPageLyricsBold.Content" xml:space="preserve">
     <value>Bold</value>
   </data>
+  <data name="SettingsPageLyricsCenterTopOffset.Header" xml:space="preserve">
+    <value>Current line position</value>
+  </data>
   <data name="SettingsPageLyricsColFactor.Header" xml:space="preserve">
     <value>Lyrics area width factor</value>
   </data>
@@ -1048,7 +1093,7 @@
     <value>Custom</value>
   </data>
   <data name="SettingsPageLyricsFontFamily.Header" xml:space="preserve">
-    <value>Lyrics font family</value>
+    <value>Font family</value>
   </data>
   <data name="SettingsPageLyricsFontSize.Header" xml:space="preserve">
     <value>Font size</value>
@@ -1059,9 +1104,6 @@
   <data name="SettingsPageLyricsFontWeight.Header" xml:space="preserve">
     <value>Font weight</value>
   </data>
-  <data name="SettingsPageLyricsGlowEffect.Description" xml:space="preserve">
-    <value>Enable glow effect for syllables with long duration</value>
-  </data>
   <data name="SettingsPageLyricsGlowEffect.Header" xml:space="preserve">
     <value>Glow effect</value>
   </data>
@@ -1092,6 +1134,9 @@
   <data name="SettingsPageLyricsNormal.Content" xml:space="preserve">
     <value>Normal</value>
   </data>
+  <data name="SettingsPageLyricsOpacity.Header" xml:space="preserve">
+    <value>Font opacity</value>
+  </data>
   <data name="SettingsPageLyricsRowFactor.Header" xml:space="preserve">
     <value>Lyrics area height factor</value>
   </data>
@@ -1149,6 +1194,9 @@
   <data name="SettingsPageLyricsVerticalEdgeOpacity.Header" xml:space="preserve">
     <value>Top and bottom edge opacity</value>
   </data>
+  <data name="SettingsPageLyricsWindow.Text" xml:space="preserve">
+    <value>Lyrics window</value>
+  </data>
   <data name="SettingsPageLyricsWindowManager.Text" xml:space="preserve">
     <value>Lyrics window manager</value>
   </data>
@@ -1191,6 +1239,15 @@
   <data name="SettingsPageMockMusicPlaying.Header" xml:space="preserve">
     <value>Play test music</value>
   </data>
+  <data name="SettingsPageMultiNowPlayingWindows.Header" xml:space="preserve">
+    <value>Multi-window coexistence mode</value>
+  </data>
+  <data name="SettingsPageMusicGallery.Text" xml:space="preserve">
+    <value>Music gallery</value>
+  </data>
+  <data name="SettingsPageMusicGalleryLyrics.Header" xml:space="preserve">
+    <value>Embedded lyrics window in music library</value>
+  </data>
   <data name="SettingsPageMusicLib.Description" xml:space="preserve">
     <value>Add folders storing music or lyrics</value>
   </data>
@@ -1239,6 +1296,9 @@
   <data name="SettingsPagePathNotFound.Text" xml:space="preserve">
     <value>The path cannot be found on your computer</value>
   </data>
+  <data name="SettingsPagePatrons.Text" xml:space="preserve">
+    <value>Special Thanks</value>
+  </data>
   <data name="SettingsPagePhonetic.Text" xml:space="preserve">
     <value>Lyric annotation</value>
   </data>
@@ -1254,9 +1314,6 @@
   <data name="SettingsPagePlaybackNotFound.Text" xml:space="preserve">
     <value>No playback source captured</value>
   </data>
-  <data name="SettingsPagePlaybackShortcut.Text" xml:space="preserve">
-    <value>Play</value>
-  </data>
   <data name="SettingsPagePlaybackSource.Header" xml:space="preserve">
     <value>Playback source</value>
   </data>
@@ -1362,6 +1419,9 @@
   <data name="SettingsPageShareHub.Content" xml:space="preserve">
     <value>Browse online resources sharing hub</value>
   </data>
+  <data name="SettingsPageShortcut.Text" xml:space="preserve">
+    <value>Play</value>
+  </data>
   <data name="SettingsPageShortcutRegFailInfo" xml:space="preserve">
     <value>This hotkey was not successfully registered</value>
   </data>
@@ -1389,6 +1449,9 @@
   <data name="SettingsPageShowTitle.Header" xml:space="preserve">
     <value>Show title</value>
   </data>
+  <data name="SettingsPageSlide.Content" xml:space="preserve">
+    <value>Slide</value>
+  </data>
   <data name="SettingsPageSliderPrefix.Text" xml:space="preserve">
     <value>Current value: </value>
   </data>
@@ -1431,6 +1494,9 @@
   <data name="SettingsPageStandardMode.Text" xml:space="preserve">
     <value>Standard mode</value>
   </data>
+  <data name="SettingsPageStartup.Text" xml:space="preserve">
+    <value>Start</value>
+  </data>
   <data name="SettingsPageStrokeFontColor.Header" xml:space="preserve">
     <value>Stroke color</value>
   </data>
@@ -1446,6 +1512,12 @@
   <data name="SettingsPageTelegram.Content" xml:space="preserve">
     <value>Telegram</value>
   </data>
+  <data name="SettingsPageThanksForPurchasing.Text" xml:space="preserve">
+    <value>Thank you for purchasing BetterLyrics</value>
+  </data>
+  <data name="SettingsPageThanksList.Header" xml:space="preserve">
+    <value>Credits</value>
+  </data>
   <data name="SettingsPageTheme.Header" xml:space="preserve">
     <value>Lyrics background theme</value>
   </data>
@@ -1515,6 +1587,9 @@
   <data name="SettingsPageWorkAreaHeight.Header" xml:space="preserve">
     <value>Work area height</value>
   </data>
+  <data name="SettingsPageYouNowUsing.Text" xml:space="preserve">
+    <value>You who are using the software</value>
+  </data>
   <data name="StandardMode" xml:space="preserve">
     <value>Standard mode</value>
   </data>

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Strings/ja-JP/Resources.resw

@@ -153,9 +153,6 @@
   <data name="DemoWindowControlDefault.Text" xml:space="preserve">
     <value>デフォルト</value>
   </data>
-  <data name="DependenciesSettingsExpander.Header" xml:space="preserve">
-    <value>依存関係</value>
-  </data>
   <data name="DesktopMode" xml:space="preserve">
     <value>デスクトップモード（透明） </value>
   </data>
@@ -198,6 +195,9 @@
   <data name="Jyutping" xml:space="preserve">
     <value>広東語のピンイン</value>
   </data>
+  <data name="KeepAtLeastOneStatusDefault" xml:space="preserve">
+    <value>少なくとも1つのステータスがデフォルトに設定されていることを確認してください</value>
+  </data>
   <data name="LastFMAuthFailed" xml:space="preserve">
     <value>承認が失敗しました、もう一度やり直してください</value>
   </data>
@@ -240,22 +240,22 @@
   <data name="LyricsPageLyricsProviderPrefix.Header" xml:space="preserve">
     <value>歌詞プロバイダー</value>
   </data>
-  <data name="LyricsPageLyricsSearchButtonToolTip.Content" xml:space="preserve">
+  <data name="LyricsPageLyricsSearch.Text" xml:space="preserve">
     <value>手動で歌詞を検索します</value>
   </data>
-  <data name="LyricsPageLyricsSettingsButtonToolTip.Content" xml:space="preserve">
+  <data name="LyricsPageLyricsSettings.Text" xml:space="preserve">
     <value>歌詞ウィンドウ管理ショートカット設定</value>
   </data>
   <data name="LyricsPageMatchPercentage.Header" xml:space="preserve">
     <value>マッチ率</value>
   </data>
-  <data name="LyricsPagePlaybackSourceButtonToolTip.Content" xml:space="preserve">
+  <data name="LyricsPagePlaybackSource.Text" xml:space="preserve">
     <value>再生ソースクイック設定</value>
   </data>
   <data name="LyricsPagePositionOffsetHint.Header" xml:space="preserve">
     <value>曲を切り替えるときに0にリセットします</value>
   </data>
-  <data name="LyricsPageSettingsButtonToolTip.Content" xml:space="preserve">
+  <data name="LyricsPageSettings.Text" xml:space="preserve">
     <value>設定</value>
   </data>
   <data name="LyricsPageTimelineOffsetButtonToolTip.Content" xml:space="preserve">
@@ -276,6 +276,9 @@
   <data name="LyricsPageTranslationProviderPrefix.Header" xml:space="preserve">
     <value>翻訳プロバイダー</value>
   </data>
+  <data name="LyricsPageTransliterationProviderPrefix.Header" xml:space="preserve">
+    <value>文字起こしソース</value>
+  </data>
   <data name="LyricsParseError" xml:space="preserve">
     <value>歌詞の解析に失敗しました</value>
   </data>
@@ -342,8 +345,8 @@
   <data name="LyricsWindowImmersiveButtonToolTip.Content" xml:space="preserve">
     <value>没入モード</value>
   </data>
-  <data name="LyricsWindowSettingsControlCurrentLyricsWindowConfig.Text" xml:space="preserve">
-    <value>現在の歌詞ウィンドウ設定</value>
+  <data name="LyricsWindowSettingsControlLyricsWindowConfig.Text" xml:space="preserve">
+    <value>構成</value>
   </data>
   <data name="LyricsWindowSettingsControlLyricsWindowMode.Header" xml:space="preserve">
     <value>歌詞ウィンドウモード</value>
@@ -487,7 +490,7 @@
     <value>シングルループ</value>
   </data>
   <data name="MusicGalleryPageSongSearchBox.PlaceholderText" xml:space="preserve">
-    <value>曲名、アーティスト、アルバム、フォルダパスを検索してください</value>
+    <value>ファイルが置かれている曲名、アーティスト、アルバム、ファイル名、またはフォルダパスを検索します</value>
   </data>
   <data name="MusicGalleryPageSortByAlbum.Content" xml:space="preserve">
     <value>アルバム</value>
@@ -513,6 +516,12 @@
   <data name="MusicGalleryPageTitle" xml:space="preserve">
     <value>音楽ギャラリー - BetterLyrics</value>
   </data>
+  <data name="MusicGalleryWindowDownButtonToolTip.Content" xml:space="preserve">
+    <value>取り戻せ</value>
+  </data>
+  <data name="MusicGalleryWindowUpButtonToolTip.Content" xml:space="preserve">
+    <value>展開</value>
+  </data>
   <data name="NarrowMode" xml:space="preserve">
     <value>狭い</value>
   </data>
@@ -534,6 +543,9 @@
   <data name="SetingsPageContributors.Text" xml:space="preserve">
     <value>投稿者</value>
   </data>
+  <data name="SetingsPageDeps.Text" xml:space="preserve">
+    <value>依存パッケージ</value>
+  </data>
   <data name="SetingsPageDonation.Text" xml:space="preserve">
     <value>寄付</value>
   </data>
@@ -582,6 +594,9 @@
   <data name="SettingsPageAlbumArt.Text" xml:space="preserve">
     <value>アルバムアート</value>
   </data>
+  <data name="SettingsPageAlbumArtHeight.Header" xml:space="preserve">
+    <value>アルバム画像の高さ</value>
+  </data>
   <data name="SettingsPageAlbumArtLayer.Header" xml:space="preserve">
     <value>アルバムアートレイヤー</value>
   </data>
@@ -591,6 +606,9 @@
   <data name="SettingsPageAlbumArtSize.Header" xml:space="preserve">
     <value>アルバムアートサイズ</value>
   </data>
+  <data name="SettingsPageAlbumEffect.Text" xml:space="preserve">
+    <value>アルバムリージョンアニメーション</value>
+  </data>
   <data name="SettingsPageAlbumLib.Content" xml:space="preserve">
     <value>アルバムアートソース</value>
   </data>
@@ -633,6 +651,9 @@
   <data name="SettingsPageAutoAdjust.Header" xml:space="preserve">
     <value>自動調整</value>
   </data>
+  <data name="SettingsPageAutoOpenLyricsWindow.Header" xml:space="preserve">
+    <value>プログラムが開始されると、デフォルトの歌詞ウィンドウが自動的に開きます</value>
+  </data>
   <data name="SettingsPageAutoOpenMusicGalleryWindow.Header" xml:space="preserve">
     <value>アプリが起動したら、音楽ライブラリウィンドウを開きます</value>
   </data>
@@ -654,9 +675,6 @@
   <data name="SettingsPageBackgroundOverlay.Text" xml:space="preserve">
     <value>歌詞の背景</value>
   </data>
-  <data name="SettingsPageBlurAmount.Header" xml:space="preserve">
-    <value>ぼやけの量</value>
-  </data>
   <data name="SettingsPageBorderless.Header" xml:space="preserve">
     <value>ボーダーレスウィンドウ</value>
   </data>
@@ -702,6 +720,9 @@
   <data name="SettingsPageClickThroughHotKey.Header" xml:space="preserve">
     <value>クリックスルーショートカットキー</value>
   </data>
+  <data name="SettingsPageCloseStatus.Text" xml:space="preserve">
+    <value>閉じる</value>
+  </data>
   <data name="SettingsPageCollapseDropdown.Content" xml:space="preserve">
     <value>ドロップダウンを折りたたみます</value>
   </data>
@@ -714,12 +735,18 @@
   <data name="SettingsPageConfigName.Header" xml:space="preserve">
     <value>設定名</value>
   </data>
+  <data name="SettingsPageConfigPlaybackSource.Text" xml:space="preserve">
+    <value>再生ソースを設定します</value>
+  </data>
   <data name="SettingsPageCreateFromCurrent.Text" xml:space="preserve">
     <value>コピー</value>
   </data>
   <data name="SettingsPageCreateFromTemplates.Content" xml:space="preserve">
     <value>テンプレートから作成</value>
   </data>
+  <data name="SettingsPageCrossfade.Content" xml:space="preserve">
+    <value>クロスフェード</value>
+  </data>
   <data name="SettingsPageCurrentLyricsWindowStatus.Text" xml:space="preserve">
     <value>現在の歌詞ウィンドウステータス</value>
   </data>
@@ -807,6 +834,12 @@
   <data name="SettingsPageEasingTypeSmoothStep.Content" xml:space="preserve">
     <value>スムーズなステップ</value>
   </data>
+  <data name="SettingsPageEffectLineStartToCurrentChar.Content" xml:space="preserve">
+    <value>現在の文字への行開始</value>
+  </data>
+  <data name="SettingsPageEffectScopeLongDurationSyllable.Content" xml:space="preserve">
+    <value>長時間の音節</value>
+  </data>
   <data name="SettingsPageEN.Content" xml:space="preserve">
     <value>English</value>
   </data>
@@ -825,6 +858,9 @@
   <data name="SettingsPageEnvColorSampleInner.Content" xml:space="preserve">
     <value>窓の中だ</value>
   </data>
+  <data name="SettingsPageExitOnGalleryWindowClosed.Header" xml:space="preserve">
+    <value>音楽ライブラリウィンドウを閉じてプログラムを終了してください</value>
+  </data>
   <data name="SettingsPageExitOnLyricsWindowClosed.Header" xml:space="preserve">
     <value>歌詞ウィンドウを閉じてプログラムを終了してください</value>
   </data>
@@ -879,6 +915,9 @@
   <data name="SettingsPageHeight.Header" xml:space="preserve">
     <value>高さ</value>
   </data>
+  <data name="SettingsPageHello.Text" xml:space="preserve">
+    <value>こんにちは</value>
+  </data>
   <data name="SettingsPageHideWindow.Description" xml:space="preserve">
     <value>音楽が再生されていないときに、自動的に歌詞ウィンドウを非表示/表示します</value>
   </data>
@@ -891,6 +930,9 @@
   <data name="SettingsPageHorizontalLayoutFactor.Text" xml:space="preserve">
     <value>水平レイアウト係数</value>
   </data>
+  <data name="SettingsPageImageSwitchType.Header" xml:space="preserve">
+    <value>アルバムダイアグラムアニメーションの切り替え</value>
+  </data>
   <data name="SettingsPageImport.Content" xml:space="preserve">
     <value>インポート</value>
   </data>
@@ -978,6 +1020,9 @@
   <data name="SettingsPageLog.Header" xml:space="preserve">
     <value>ログレコード</value>
   </data>
+  <data name="SettingsPageLongSyllableDuration.Header" xml:space="preserve">
+    <value>長い音節のしきい値</value>
+  </data>
   <data name="SettingsPageLXMusicServer.Header" xml:space="preserve">
     <value>LX Music Server</value>
   </data>
@@ -996,18 +1041,18 @@
   <data name="SettingsPageLyricsBlack.Content" xml:space="preserve">
     <value>黒</value>
   </data>
-  <data name="SettingsPageLyricsBlurAmount.Header" xml:space="preserve">
-    <value>ぼやけの量</value>
+  <data name="SettingsPageLyricsBlurEffect.Description" xml:space="preserve">
+    <value>現在ではない行のぼかしを有効にします</value>
   </data>
-  <data name="SettingsPageLyricsBlurAmountSideEffect.Text" xml:space="preserve">
-    <value>この値を調整すると、アルバム画像のバックグラウンドブラー強度も増加します。</value>
-  </data>
-  <data name="SettingsPageLyricsBlurHighGPUUsage.Text" xml:space="preserve">
-    <value>ぼかしが有効になっている場合のGPU使用量が大幅に高くなります（&gt; 0）</value>
+  <data name="SettingsPageLyricsBlurEffect.Header" xml:space="preserve">
+    <value>ぼかし効果</value>
   </data>
   <data name="SettingsPageLyricsBold.Content" xml:space="preserve">
     <value>大胆な</value>
   </data>
+  <data name="SettingsPageLyricsCenterTopOffset.Header" xml:space="preserve">
+    <value>現在の行の位置</value>
+  </data>
   <data name="SettingsPageLyricsColFactor.Header" xml:space="preserve">
     <value>歌詞エリア幅係数</value>
   </data>
@@ -1048,7 +1093,7 @@
     <value>カスタマイズ</value>
   </data>
   <data name="SettingsPageLyricsFontFamily.Header" xml:space="preserve">
-    <value>歌詞フォントファミリー</value>
+    <value>フォントファミリー</value>
   </data>
   <data name="SettingsPageLyricsFontSize.Header" xml:space="preserve">
     <value>フォントサイズ</value>
@@ -1059,9 +1104,6 @@
   <data name="SettingsPageLyricsFontWeight.Header" xml:space="preserve">
     <value>フォント重量</value>
   </data>
-  <data name="SettingsPageLyricsGlowEffect.Description" xml:space="preserve">
-    <value>長時間の音節にグロウ効果を有効にします</value>
-  </data>
   <data name="SettingsPageLyricsGlowEffect.Header" xml:space="preserve">
     <value>グロー効果</value>
   </data>
@@ -1092,6 +1134,9 @@
   <data name="SettingsPageLyricsNormal.Content" xml:space="preserve">
     <value>普通</value>
   </data>
+  <data name="SettingsPageLyricsOpacity.Header" xml:space="preserve">
+    <value>フォントの不透明度</value>
+  </data>
   <data name="SettingsPageLyricsRowFactor.Header" xml:space="preserve">
     <value>歌詞エリアの高さ係数</value>
   </data>
@@ -1149,6 +1194,9 @@
   <data name="SettingsPageLyricsVerticalEdgeOpacity.Header" xml:space="preserve">
     <value>上端と下端の不透明度</value>
   </data>
+  <data name="SettingsPageLyricsWindow.Text" xml:space="preserve">
+    <value>歌詞ウィンドウ</value>
+  </data>
   <data name="SettingsPageLyricsWindowManager.Text" xml:space="preserve">
     <value>歌詞ウィンドウマネージャー</value>
   </data>
@@ -1191,6 +1239,15 @@
   <data name="SettingsPageMockMusicPlaying.Header" xml:space="preserve">
     <value>テスト音楽を再生します</value>
   </data>
+  <data name="SettingsPageMultiNowPlayingWindows.Header" xml:space="preserve">
+    <value>マルチウィンドウ共存モード</value>
+  </data>
+  <data name="SettingsPageMusicGallery.Text" xml:space="preserve">
+    <value>ミュージックギャラリー</value>
+  </data>
+  <data name="SettingsPageMusicGalleryLyrics.Header" xml:space="preserve">
+    <value>歌詞ウィンドウが埋め込まれた音楽ライブラリ</value>
+  </data>
   <data name="SettingsPageMusicLib.Description" xml:space="preserve">
     <value>音楽や歌詞を保存するフォルダーを追加します</value>
   </data>
@@ -1239,6 +1296,9 @@
   <data name="SettingsPagePathNotFound.Text" xml:space="preserve">
     <value>パスはコンピューターでは見つかりません</value>
   </data>
+  <data name="SettingsPagePatrons.Text" xml:space="preserve">
+    <value>スペシャルサンクス</value>
+  </data>
   <data name="SettingsPagePhonetic.Text" xml:space="preserve">
     <value>リリックアノテーション</value>
   </data>
@@ -1254,9 +1314,6 @@
   <data name="SettingsPagePlaybackNotFound.Text" xml:space="preserve">
     <value>キャプチャされた再生ソースはありません</value>
   </data>
-  <data name="SettingsPagePlaybackShortcut.Text" xml:space="preserve">
-    <value>遊ぶ</value>
-  </data>
   <data name="SettingsPagePlaybackSource.Header" xml:space="preserve">
     <value>再生ソース</value>
   </data>
@@ -1362,6 +1419,9 @@
   <data name="SettingsPageShareHub.Content" xml:space="preserve">
     <value>オンラインリソース共有ハブを閲覧しましょう</value>
   </data>
+  <data name="SettingsPageShortcut.Text" xml:space="preserve">
+    <value>ショートカットキー</value>
+  </data>
   <data name="SettingsPageShortcutRegFailInfo" xml:space="preserve">
     <value>このホットキーは正常に登録されていません</value>
   </data>
@@ -1389,6 +1449,9 @@
   <data name="SettingsPageShowTitle.Header" xml:space="preserve">
     <value>タイトルを表示</value>
   </data>
+  <data name="SettingsPageSlide.Content" xml:space="preserve">
+    <value>スライド</value>
+  </data>
   <data name="SettingsPageSliderPrefix.Text" xml:space="preserve">
     <value>現在の値： </value>
   </data>
@@ -1431,6 +1494,9 @@
   <data name="SettingsPageStandardMode.Text" xml:space="preserve">
     <value>標準モード</value>
   </data>
+  <data name="SettingsPageStartup.Text" xml:space="preserve">
+    <value>起動</value>
+  </data>
   <data name="SettingsPageStrokeFontColor.Header" xml:space="preserve">
     <value>ストロークカラー</value>
   </data>
@@ -1446,6 +1512,12 @@
   <data name="SettingsPageTelegram.Content" xml:space="preserve">
     <value>Telegram</value>
   </data>
+  <data name="SettingsPageThanksForPurchasing.Text" xml:space="preserve">
+    <value>BetterLyrics をご購入いただきありがとうございます</value>
+  </data>
+  <data name="SettingsPageThanksList.Header" xml:space="preserve">
+    <value>ありがとうございました</value>
+  </data>
   <data name="SettingsPageTheme.Header" xml:space="preserve">
     <value>歌詞の背景テーマ</value>
   </data>
@@ -1515,6 +1587,9 @@
   <data name="SettingsPageWorkAreaHeight.Header" xml:space="preserve">
     <value>作業エリアの高さ</value>
   </data>
+  <data name="SettingsPageYouNowUsing.Text" xml:space="preserve">
+    <value>ソフトウェアを使用しているあなた</value>
+  </data>
   <data name="StandardMode" xml:space="preserve">
     <value>標準モード</value>
   </data>

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Strings/ko-KR/Resources.resw

@@ -153,9 +153,6 @@
   <data name="DemoWindowControlDefault.Text" xml:space="preserve">
     <value>기본</value>
   </data>
-  <data name="DependenciesSettingsExpander.Header" xml:space="preserve">
-    <value>의존성</value>
-  </data>
   <data name="DesktopMode" xml:space="preserve">
     <value>데스크톱 모드 (투명)</value>
   </data>
@@ -198,6 +195,9 @@
   <data name="Jyutping" xml:space="preserve">
     <value>광둥어 병음</value>
   </data>
+  <data name="KeepAtLeastOneStatusDefault" xml:space="preserve">
+    <value>하나 이상의 상태가 기본값으로 설정되어 있는지 확인하십시오</value>
+  </data>
   <data name="LastFMAuthFailed" xml:space="preserve">
     <value>승인이 실패했습니다. 다시 시도하십시오</value>
   </data>
@@ -240,22 +240,22 @@
   <data name="LyricsPageLyricsProviderPrefix.Header" xml:space="preserve">
     <value>가사 제공자</value>
   </data>
-  <data name="LyricsPageLyricsSearchButtonToolTip.Content" xml:space="preserve">
+  <data name="LyricsPageLyricsSearch.Text" xml:space="preserve">
     <value>가사를 수동으로 검색합니다</value>
   </data>
-  <data name="LyricsPageLyricsSettingsButtonToolTip.Content" xml:space="preserve">
+  <data name="LyricsPageLyricsSettings.Text" xml:space="preserve">
     <value>가사 창 관리 바로 가기 설정</value>
   </data>
   <data name="LyricsPageMatchPercentage.Header" xml:space="preserve">
     <value>매치 퍼센트</value>
   </data>
-  <data name="LyricsPagePlaybackSourceButtonToolTip.Content" xml:space="preserve">
+  <data name="LyricsPagePlaybackSource.Text" xml:space="preserve">
     <value>재생 소스 빠른 설정</value>
   </data>
   <data name="LyricsPagePositionOffsetHint.Header" xml:space="preserve">
     <value>노래를 전환 할 때 0 으로 재설정하십시오</value>
   </data>
-  <data name="LyricsPageSettingsButtonToolTip.Content" xml:space="preserve">
+  <data name="LyricsPageSettings.Text" xml:space="preserve">
     <value>설정</value>
   </data>
   <data name="LyricsPageTimelineOffsetButtonToolTip.Content" xml:space="preserve">
@@ -276,6 +276,9 @@
   <data name="LyricsPageTranslationProviderPrefix.Header" xml:space="preserve">
     <value>번역 제공자</value>
   </data>
+  <data name="LyricsPageTransliterationProviderPrefix.Header" xml:space="preserve">
+    <value>음역 소스</value>
+  </data>
   <data name="LyricsParseError" xml:space="preserve">
     <value>가사 구문 분석에 실패했습니다</value>
   </data>
@@ -342,8 +345,8 @@
   <data name="LyricsWindowImmersiveButtonToolTip.Content" xml:space="preserve">
     <value>몰입 형 모드</value>
   </data>
-  <data name="LyricsWindowSettingsControlCurrentLyricsWindowConfig.Text" xml:space="preserve">
-    <value>현재 가사 창 구성</value>
+  <data name="LyricsWindowSettingsControlLyricsWindowConfig.Text" xml:space="preserve">
+    <value>배 치</value>
   </data>
   <data name="LyricsWindowSettingsControlLyricsWindowMode.Header" xml:space="preserve">
     <value>가사 창 모드</value>
@@ -487,7 +490,7 @@
     <value>단일 루프</value>
   </data>
   <data name="MusicGalleryPageSongSearchBox.PlaceholderText" xml:space="preserve">
-    <value>노래 제목, 아티스트, 앨범 또는 폴더 경로를 검색하세요</value>
+    <value>파일이 있는 노래 이름, 아티스트, 앨범, 파일 이름 또는 폴더 경로를 검색하세요</value>
   </data>
   <data name="MusicGalleryPageSortByAlbum.Content" xml:space="preserve">
     <value>앨범</value>
@@ -513,6 +516,12 @@
   <data name="MusicGalleryPageTitle" xml:space="preserve">
     <value>음악 갤러리 - BetterLyrics</value>
   </data>
+  <data name="MusicGalleryWindowDownButtonToolTip.Content" xml:space="preserve">
+    <value>다시 가져가세요</value>
+  </data>
+  <data name="MusicGalleryWindowUpButtonToolTip.Content" xml:space="preserve">
+    <value>펼치기</value>
+  </data>
   <data name="NarrowMode" xml:space="preserve">
     <value>협폭 조명</value>
   </data>
@@ -534,6 +543,9 @@
   <data name="SetingsPageContributors.Text" xml:space="preserve">
     <value>기여자</value>
   </data>
+  <data name="SetingsPageDeps.Text" xml:space="preserve">
+    <value>종속 패키지</value>
+  </data>
   <data name="SetingsPageDonation.Text" xml:space="preserve">
     <value>기부</value>
   </data>
@@ -582,6 +594,9 @@
   <data name="SettingsPageAlbumArt.Text" xml:space="preserve">
     <value>앨범 아트</value>
   </data>
+  <data name="SettingsPageAlbumArtHeight.Header" xml:space="preserve">
+    <value>앨범 이미지 높이</value>
+  </data>
   <data name="SettingsPageAlbumArtLayer.Header" xml:space="preserve">
     <value>앨범 아트 레이어</value>
   </data>
@@ -591,6 +606,9 @@
   <data name="SettingsPageAlbumArtSize.Header" xml:space="preserve">
     <value>앨범 아트 크기</value>
   </data>
+  <data name="SettingsPageAlbumEffect.Text" xml:space="preserve">
+    <value>앨범 지역 애니메이션</value>
+  </data>
   <data name="SettingsPageAlbumLib.Content" xml:space="preserve">
     <value>앨범 아트 소스</value>
   </data>
@@ -633,6 +651,9 @@
   <data name="SettingsPageAutoAdjust.Header" xml:space="preserve">
     <value>자동 조정</value>
   </data>
+  <data name="SettingsPageAutoOpenLyricsWindow.Header" xml:space="preserve">
+    <value>프로그램이 시작되면 기본 가사 창이 자동으로 열립니다</value>
+  </data>
   <data name="SettingsPageAutoOpenMusicGalleryWindow.Header" xml:space="preserve">
     <value>앱이 시작되면 음악 라이브러리 창을 여세요</value>
   </data>
@@ -654,9 +675,6 @@
   <data name="SettingsPageBackgroundOverlay.Text" xml:space="preserve">
     <value>가사 배경</value>
   </data>
-  <data name="SettingsPageBlurAmount.Header" xml:space="preserve">
-    <value>흐림 금액</value>
-  </data>
   <data name="SettingsPageBorderless.Header" xml:space="preserve">
     <value>창문</value>
   </data>
@@ -702,6 +720,9 @@
   <data name="SettingsPageClickThroughHotKey.Header" xml:space="preserve">
     <value>바로 가기 키를 클릭하세요</value>
   </data>
+  <data name="SettingsPageCloseStatus.Text" xml:space="preserve">
+    <value>닫기</value>
+  </data>
   <data name="SettingsPageCollapseDropdown.Content" xml:space="preserve">
     <value>드롭다운 접기</value>
   </data>
@@ -714,12 +735,18 @@
   <data name="SettingsPageConfigName.Header" xml:space="preserve">
     <value>환경 설정</value>
   </data>
+  <data name="SettingsPageConfigPlaybackSource.Text" xml:space="preserve">
+    <value>재생 소스 구성</value>
+  </data>
   <data name="SettingsPageCreateFromCurrent.Text" xml:space="preserve">
     <value>접수</value>
   </data>
   <data name="SettingsPageCreateFromTemplates.Content" xml:space="preserve">
     <value>템플릿에서 만들기</value>
   </data>
+  <data name="SettingsPageCrossfade.Content" xml:space="preserve">
+    <value>크로스 페이드</value>
+  </data>
   <data name="SettingsPageCurrentLyricsWindowStatus.Text" xml:space="preserve">
     <value>현재 가사 창 상태</value>
   </data>
@@ -807,6 +834,12 @@
   <data name="SettingsPageEasingTypeSmoothStep.Content" xml:space="preserve">
     <value>부드러운 단계</value>
   </data>
+  <data name="SettingsPageEffectLineStartToCurrentChar.Content" xml:space="preserve">
+    <value>현재 문자로 줄 시작</value>
+  </data>
+  <data name="SettingsPageEffectScopeLongDurationSyllable.Content" xml:space="preserve">
+    <value>긴 지속 시간 음절</value>
+  </data>
   <data name="SettingsPageEN.Content" xml:space="preserve">
     <value>English</value>
   </data>
@@ -825,6 +858,9 @@
   <data name="SettingsPageEnvColorSampleInner.Content" xml:space="preserve">
     <value>창문 안쪽</value>
   </data>
+  <data name="SettingsPageExitOnGalleryWindowClosed.Header" xml:space="preserve">
+    <value>음악 라이브러리 창을 닫을 때 프로그램을 종료하십시오</value>
+  </data>
   <data name="SettingsPageExitOnLyricsWindowClosed.Header" xml:space="preserve">
     <value>가사 창을 닫으면 프로그램을 종료하세요</value>
   </data>
@@ -879,6 +915,9 @@
   <data name="SettingsPageHeight.Header" xml:space="preserve">
     <value>신장</value>
   </data>
+  <data name="SettingsPageHello.Text" xml:space="preserve">
+    <value>안녕</value>
+  </data>
   <data name="SettingsPageHideWindow.Description" xml:space="preserve">
     <value>음악이 재생되지 않을 때 자동으로 가사 창 숨기기/표시</value>
   </data>
@@ -891,6 +930,9 @@
   <data name="SettingsPageHorizontalLayoutFactor.Text" xml:space="preserve">
     <value>수평 레이아웃 요소</value>
   </data>
+  <data name="SettingsPageImageSwitchType.Header" xml:space="preserve">
+    <value>앨범 다이어그램 토글 애니메이션</value>
+  </data>
   <data name="SettingsPageImport.Content" xml:space="preserve">
     <value>가져오기</value>
   </data>
@@ -978,6 +1020,9 @@
   <data name="SettingsPageLog.Header" xml:space="preserve">
     <value>로그 레코드</value>
   </data>
+  <data name="SettingsPageLongSyllableDuration.Header" xml:space="preserve">
+    <value>긴 음절 임계값</value>
+  </data>
   <data name="SettingsPageLXMusicServer.Header" xml:space="preserve">
     <value>LX 음악 서버</value>
   </data>
@@ -996,18 +1041,18 @@
   <data name="SettingsPageLyricsBlack.Content" xml:space="preserve">
     <value>검은색</value>
   </data>
-  <data name="SettingsPageLyricsBlurAmount.Header" xml:space="preserve">
-    <value>흐림 금액</value>
+  <data name="SettingsPageLyricsBlurEffect.Description" xml:space="preserve">
+    <value>현재 행이 아닌 행에 블러 활성화</value>
   </data>
-  <data name="SettingsPageLyricsBlurAmountSideEffect.Text" xml:space="preserve">
-    <value>이 값을 조정하면 앨범 이미지의 배경 흐림 강도가 증가합니다.</value>
-  </data>
-  <data name="SettingsPageLyricsBlurHighGPUUsage.Text" xml:space="preserve">
-    <value>Blur가 활성화 될 때 상당히 높은 GPU 사용량 (&gt; 0)</value>
+  <data name="SettingsPageLyricsBlurEffect.Header" xml:space="preserve">
+    <value>흐림 효과</value>
   </data>
   <data name="SettingsPageLyricsBold.Content" xml:space="preserve">
     <value>용감한</value>
   </data>
+  <data name="SettingsPageLyricsCenterTopOffset.Header" xml:space="preserve">
+    <value>현재 행 위치</value>
+  </data>
   <data name="SettingsPageLyricsColFactor.Header" xml:space="preserve">
     <value>가사 영역 너비 계수</value>
   </data>
@@ -1048,7 +1093,7 @@
     <value>사용자 정의하십시오</value>
   </data>
   <data name="SettingsPageLyricsFontFamily.Header" xml:space="preserve">
-    <value>가사 글꼴 가족</value>
+    <value>폰트 패밀리</value>
   </data>
   <data name="SettingsPageLyricsFontSize.Header" xml:space="preserve">
     <value>글꼴 크기</value>
@@ -1059,9 +1104,6 @@
   <data name="SettingsPageLyricsFontWeight.Header" xml:space="preserve">
     <value>글꼴 무게</value>
   </data>
-  <data name="SettingsPageLyricsGlowEffect.Description" xml:space="preserve">
-    <value>지속 시간이 긴 음절에 대해 발광 효과를 활성화합니다</value>
-  </data>
   <data name="SettingsPageLyricsGlowEffect.Header" xml:space="preserve">
     <value>글로우 효과</value>
   </data>
@@ -1092,6 +1134,9 @@
   <data name="SettingsPageLyricsNormal.Content" xml:space="preserve">
     <value>정상</value>
   </data>
+  <data name="SettingsPageLyricsOpacity.Header" xml:space="preserve">
+    <value>글꼴 불투명도</value>
+  </data>
   <data name="SettingsPageLyricsRowFactor.Header" xml:space="preserve">
     <value>가사 영역 높이 계수</value>
   </data>
@@ -1149,6 +1194,9 @@
   <data name="SettingsPageLyricsVerticalEdgeOpacity.Header" xml:space="preserve">
     <value>상단 및 하단 가장자리 불투명도</value>
   </data>
+  <data name="SettingsPageLyricsWindow.Text" xml:space="preserve">
+    <value>가사 창</value>
+  </data>
   <data name="SettingsPageLyricsWindowManager.Text" xml:space="preserve">
     <value>가사 창 관리자</value>
   </data>
@@ -1191,6 +1239,15 @@
   <data name="SettingsPageMockMusicPlaying.Header" xml:space="preserve">
     <value>테스트 음악을 재생하십시오</value>
   </data>
+  <data name="SettingsPageMultiNowPlayingWindows.Header" xml:space="preserve">
+    <value>다중 창 공존 모드</value>
+  </data>
+  <data name="SettingsPageMusicGallery.Text" xml:space="preserve">
+    <value>음악 갤러리</value>
+  </data>
+  <data name="SettingsPageMusicGalleryLyrics.Header" xml:space="preserve">
+    <value>가사 창이 내장된 음악 라이브러리</value>
+  </data>
   <data name="SettingsPageMusicLib.Description" xml:space="preserve">
     <value>음악이나 가사를 저장하는 폴더 추가</value>
   </data>
@@ -1239,6 +1296,9 @@
   <data name="SettingsPagePathNotFound.Text" xml:space="preserve">
     <value>경로는 컴퓨터에서 찾을 수 없습니다</value>
   </data>
+  <data name="SettingsPagePatrons.Text" xml:space="preserve">
+    <value>특별 감사 인사</value>
+  </data>
   <data name="SettingsPagePhonetic.Text" xml:space="preserve">
     <value>가사 주석</value>
   </data>
@@ -1254,9 +1314,6 @@
   <data name="SettingsPagePlaybackNotFound.Text" xml:space="preserve">
     <value>재생 소스가 캡처되지 않았습니다</value>
   </data>
-  <data name="SettingsPagePlaybackShortcut.Text" xml:space="preserve">
-    <value>놀다</value>
-  </data>
   <data name="SettingsPagePlaybackSource.Header" xml:space="preserve">
     <value>재생 소스</value>
   </data>
@@ -1362,6 +1419,9 @@
   <data name="SettingsPageShareHub.Content" xml:space="preserve">
     <value>온라인 리소스 공유 허브를 둘러보세요</value>
   </data>
+  <data name="SettingsPageShortcut.Text" xml:space="preserve">
+    <value>단축키</value>
+  </data>
   <data name="SettingsPageShortcutRegFailInfo" xml:space="preserve">
     <value>이 핫키는 성공적으로 등록되지 않았습니다</value>
   </data>
@@ -1389,6 +1449,9 @@
   <data name="SettingsPageShowTitle.Header" xml:space="preserve">
     <value>제목 표시</value>
   </data>
+  <data name="SettingsPageSlide.Content" xml:space="preserve">
+    <value>살짝 밀기</value>
+  </data>
   <data name="SettingsPageSliderPrefix.Text" xml:space="preserve">
     <value>현재 가치 : </value>
   </data>
@@ -1431,6 +1494,9 @@
   <data name="SettingsPageStandardMode.Text" xml:space="preserve">
     <value>표준 모드</value>
   </data>
+  <data name="SettingsPageStartup.Text" xml:space="preserve">
+    <value>시작</value>
+  </data>
   <data name="SettingsPageStrokeFontColor.Header" xml:space="preserve">
     <value>윤곽선 색상</value>
   </data>
@@ -1446,6 +1512,12 @@
   <data name="SettingsPageTelegram.Content" xml:space="preserve">
     <value>Telegram</value>
   </data>
+  <data name="SettingsPageThanksForPurchasing.Text" xml:space="preserve">
+    <value>BetterLyrics 를 구매해 주셔서 감사합니다</value>
+  </data>
+  <data name="SettingsPageThanksList.Header" xml:space="preserve">
+    <value>감사합니다</value>
+  </data>
   <data name="SettingsPageTheme.Header" xml:space="preserve">
     <value>가사 배경 테마</value>
   </data>
@@ -1515,6 +1587,9 @@
   <data name="SettingsPageWorkAreaHeight.Header" xml:space="preserve">
     <value>작업 영역 높이</value>
   </data>
+  <data name="SettingsPageYouNowUsing.Text" xml:space="preserve">
+    <value>소프트웨어를 사용하는 여러분</value>
+  </data>
   <data name="StandardMode" xml:space="preserve">
     <value>표준 모드</value>
   </data>

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Strings/zh-CN/Resources.resw

@@ -153,9 +153,6 @@
   <data name="DemoWindowControlDefault.Text" xml:space="preserve">
     <value>默认</value>
   </data>
-  <data name="DependenciesSettingsExpander.Header" xml:space="preserve">
-    <value>依赖</value>
-  </data>
   <data name="DesktopMode" xml:space="preserve">
     <value>桌面模式（透明）</value>
   </data>
@@ -198,6 +195,9 @@
   <data name="Jyutping" xml:space="preserve">
     <value>粤语拼音</value>
   </data>
+  <data name="KeepAtLeastOneStatusDefault" xml:space="preserve">
+    <value>请确保至少有一个状态被设为默认</value>
+  </data>
   <data name="LastFMAuthFailed" xml:space="preserve">
     <value>授权失败，请重试</value>
   </data>
@@ -240,22 +240,22 @@
   <data name="LyricsPageLyricsProviderPrefix.Header" xml:space="preserve">
     <value>歌词来源</value>
   </data>
-  <data name="LyricsPageLyricsSearchButtonToolTip.Content" xml:space="preserve">
+  <data name="LyricsPageLyricsSearch.Text" xml:space="preserve">
     <value>手动检索歌词</value>
   </data>
-  <data name="LyricsPageLyricsSettingsButtonToolTip.Content" xml:space="preserve">
+  <data name="LyricsPageLyricsSettings.Text" xml:space="preserve">
     <value>歌词窗口管理快捷设置</value>
   </data>
   <data name="LyricsPageMatchPercentage.Header" xml:space="preserve">
     <value>匹配百分比</value>
   </data>
-  <data name="LyricsPagePlaybackSourceButtonToolTip.Content" xml:space="preserve">
+  <data name="LyricsPagePlaybackSource.Text" xml:space="preserve">
     <value>播放源快捷设置</value>
   </data>
   <data name="LyricsPagePositionOffsetHint.Header" xml:space="preserve">
     <value>切换歌曲时重置为 0</value>
   </data>
-  <data name="LyricsPageSettingsButtonToolTip.Content" xml:space="preserve">
+  <data name="LyricsPageSettings.Text" xml:space="preserve">
     <value>设置</value>
   </data>
   <data name="LyricsPageTimelineOffsetButtonToolTip.Content" xml:space="preserve">
@@ -276,6 +276,9 @@
   <data name="LyricsPageTranslationProviderPrefix.Header" xml:space="preserve">
     <value>翻译来源</value>
   </data>
+  <data name="LyricsPageTransliterationProviderPrefix.Header" xml:space="preserve">
+    <value>音译来源</value>
+  </data>
   <data name="LyricsParseError" xml:space="preserve">
     <value>歌词解析失败</value>
   </data>
@@ -342,8 +345,8 @@
   <data name="LyricsWindowImmersiveButtonToolTip.Content" xml:space="preserve">
     <value>沉浸模式</value>
   </data>
-  <data name="LyricsWindowSettingsControlCurrentLyricsWindowConfig.Text" xml:space="preserve">
-    <value>当前歌词窗口配置</value>
+  <data name="LyricsWindowSettingsControlLyricsWindowConfig.Text" xml:space="preserve">
+    <value>配置</value>
   </data>
   <data name="LyricsWindowSettingsControlLyricsWindowMode.Header" xml:space="preserve">
     <value>歌词窗口模式</value>
@@ -487,7 +490,7 @@
     <value>单曲循环</value>
   </data>
   <data name="MusicGalleryPageSongSearchBox.PlaceholderText" xml:space="preserve">
-    <value>搜索歌曲名、艺术家、专辑或所在文件夹路径</value>
+    <value>搜索歌曲名、艺术家、专辑、文件名或文件所在文件夹路径</value>
   </data>
   <data name="MusicGalleryPageSortByAlbum.Content" xml:space="preserve">
     <value>专辑</value>
@@ -513,6 +516,12 @@
   <data name="MusicGalleryPageTitle" xml:space="preserve">
     <value>音乐库 - BetterLyrics</value>
   </data>
+  <data name="MusicGalleryWindowDownButtonToolTip.Content" xml:space="preserve">
+    <value>收回</value>
+  </data>
+  <data name="MusicGalleryWindowUpButtonToolTip.Content" xml:space="preserve">
+    <value>展开</value>
+  </data>
   <data name="NarrowMode" xml:space="preserve">
     <value>窄屏模式</value>
   </data>
@@ -534,6 +543,9 @@
   <data name="SetingsPageContributors.Text" xml:space="preserve">
     <value>贡献者</value>
   </data>
+  <data name="SetingsPageDeps.Text" xml:space="preserve">
+    <value>依赖包</value>
+  </data>
   <data name="SetingsPageDonation.Text" xml:space="preserve">
     <value>捐贈</value>
   </data>
@@ -582,6 +594,9 @@
   <data name="SettingsPageAlbumArt.Text" xml:space="preserve">
     <value>专辑</value>
   </data>
+  <data name="SettingsPageAlbumArtHeight.Header" xml:space="preserve">
+    <value>专辑图片高度</value>
+  </data>
   <data name="SettingsPageAlbumArtLayer.Header" xml:space="preserve">
     <value>专辑艺术图层</value>
   </data>
@@ -591,6 +606,9 @@
   <data name="SettingsPageAlbumArtSize.Header" xml:space="preserve">
     <value>专辑封面尺寸</value>
   </data>
+  <data name="SettingsPageAlbumEffect.Text" xml:space="preserve">
+    <value>专辑区域动效</value>
+  </data>
   <data name="SettingsPageAlbumLib.Content" xml:space="preserve">
     <value>专辑封面源</value>
   </data>
@@ -633,6 +651,9 @@
   <data name="SettingsPageAutoAdjust.Header" xml:space="preserve">
     <value>自动调整</value>
   </data>
+  <data name="SettingsPageAutoOpenLyricsWindow.Header" xml:space="preserve">
+    <value>程序启动时自动打开默认歌词窗口</value>
+  </data>
   <data name="SettingsPageAutoOpenMusicGalleryWindow.Header" xml:space="preserve">
     <value>应用程序启动时打开音乐库窗口</value>
   </data>
@@ -654,9 +675,6 @@
   <data name="SettingsPageBackgroundOverlay.Text" xml:space="preserve">
     <value>歌词背景</value>
   </data>
-  <data name="SettingsPageBlurAmount.Header" xml:space="preserve">
-    <value>模糊度</value>
-  </data>
   <data name="SettingsPageBorderless.Header" xml:space="preserve">
     <value>无边框窗口</value>
   </data>
@@ -702,6 +720,9 @@
   <data name="SettingsPageClickThroughHotKey.Header" xml:space="preserve">
     <value>点击穿透快捷键</value>
   </data>
+  <data name="SettingsPageCloseStatus.Text" xml:space="preserve">
+    <value>关闭</value>
+  </data>
   <data name="SettingsPageCollapseDropdown.Content" xml:space="preserve">
     <value>折叠下拉列表</value>
   </data>
@@ -714,12 +735,18 @@
   <data name="SettingsPageConfigName.Header" xml:space="preserve">
     <value>配置名称</value>
   </data>
+  <data name="SettingsPageConfigPlaybackSource.Text" xml:space="preserve">
+    <value>配置播放源</value>
+  </data>
   <data name="SettingsPageCreateFromCurrent.Text" xml:space="preserve">
     <value>拷贝</value>
   </data>
   <data name="SettingsPageCreateFromTemplates.Content" xml:space="preserve">
     <value>从模板创建</value>
   </data>
+  <data name="SettingsPageCrossfade.Content" xml:space="preserve">
+    <value>交叉淡入淡出</value>
+  </data>
   <data name="SettingsPageCurrentLyricsWindowStatus.Text" xml:space="preserve">
     <value>当前歌词窗口状态</value>
   </data>
@@ -807,6 +834,12 @@
   <data name="SettingsPageEasingTypeSmoothStep.Content" xml:space="preserve">
     <value>平滑步进</value>
   </data>
+  <data name="SettingsPageEffectLineStartToCurrentChar.Content" xml:space="preserve">
+    <value>行开始到当前字符</value>
+  </data>
+  <data name="SettingsPageEffectScopeLongDurationSyllable.Content" xml:space="preserve">
+    <value>长时间音节</value>
+  </data>
   <data name="SettingsPageEN.Content" xml:space="preserve">
     <value>English</value>
   </data>
@@ -825,6 +858,9 @@
   <data name="SettingsPageEnvColorSampleInner.Content" xml:space="preserve">
     <value>窗口内部</value>
   </data>
+  <data name="SettingsPageExitOnGalleryWindowClosed.Header" xml:space="preserve">
+    <value>关闭音乐库窗口时退出程序</value>
+  </data>
   <data name="SettingsPageExitOnLyricsWindowClosed.Header" xml:space="preserve">
     <value>关闭歌词窗口时退出程序</value>
   </data>
@@ -879,6 +915,9 @@
   <data name="SettingsPageHeight.Header" xml:space="preserve">
     <value>高度</value>
   </data>
+  <data name="SettingsPageHello.Text" xml:space="preserve">
+    <value>您好</value>
+  </data>
   <data name="SettingsPageHideWindow.Description" xml:space="preserve">
     <value>音乐未播放/播放时自动隐藏/显示歌词窗口</value>
   </data>
@@ -891,6 +930,9 @@
   <data name="SettingsPageHorizontalLayoutFactor.Text" xml:space="preserve">
     <value>水平布局系数</value>
   </data>
+  <data name="SettingsPageImageSwitchType.Header" xml:space="preserve">
+    <value>专辑图切换动画</value>
+  </data>
   <data name="SettingsPageImport.Content" xml:space="preserve">
     <value>导入</value>
   </data>
@@ -978,6 +1020,9 @@
   <data name="SettingsPageLog.Header" xml:space="preserve">
     <value>日志记录</value>
   </data>
+  <data name="SettingsPageLongSyllableDuration.Header" xml:space="preserve">
+    <value>长音节阈值</value>
+  </data>
   <data name="SettingsPageLXMusicServer.Header" xml:space="preserve">
     <value>LX 音乐服务器</value>
   </data>
@@ -996,18 +1041,18 @@
   <data name="SettingsPageLyricsBlack.Content" xml:space="preserve">
     <value>黑体</value>
   </data>
-  <data name="SettingsPageLyricsBlurAmount.Header" xml:space="preserve">
-    <value>模糊度</value>
+  <data name="SettingsPageLyricsBlurEffect.Description" xml:space="preserve">
+    <value>为非当前行启用模糊效果</value>
   </data>
-  <data name="SettingsPageLyricsBlurAmountSideEffect.Text" xml:space="preserve">
-    <value>调整该数值将同步提高专辑图片背景模糊强度</value>
-  </data>
-  <data name="SettingsPageLyricsBlurHighGPUUsage.Text" xml:space="preserve">
-    <value>启用模糊（&gt; 0）时将显著提升 GPU 占用率</value>
+  <data name="SettingsPageLyricsBlurEffect.Header" xml:space="preserve">
+    <value>模糊效果</value>
   </data>
   <data name="SettingsPageLyricsBold.Content" xml:space="preserve">
     <value>粗体</value>
   </data>
+  <data name="SettingsPageLyricsCenterTopOffset.Header" xml:space="preserve">
+    <value>当前行位置</value>
+  </data>
   <data name="SettingsPageLyricsColFactor.Header" xml:space="preserve">
     <value>歌词区域宽度因子</value>
   </data>
@@ -1048,7 +1093,7 @@
     <value>自定义</value>
   </data>
   <data name="SettingsPageLyricsFontFamily.Header" xml:space="preserve">
-    <value>歌词字体</value>
+    <value>字体家族</value>
   </data>
   <data name="SettingsPageLyricsFontSize.Header" xml:space="preserve">
     <value>字体大小</value>
@@ -1059,9 +1104,6 @@
   <data name="SettingsPageLyricsFontWeight.Header" xml:space="preserve">
     <value>字体粗细</value>
   </data>
-  <data name="SettingsPageLyricsGlowEffect.Description" xml:space="preserve">
-    <value>为持续时间较长的音节启用发光效果</value>
-  </data>
   <data name="SettingsPageLyricsGlowEffect.Header" xml:space="preserve">
     <value>辉光效果</value>
   </data>
@@ -1092,6 +1134,9 @@
   <data name="SettingsPageLyricsNormal.Content" xml:space="preserve">
     <value>常规</value>
   </data>
+  <data name="SettingsPageLyricsOpacity.Header" xml:space="preserve">
+    <value>字体不透明度</value>
+  </data>
   <data name="SettingsPageLyricsRowFactor.Header" xml:space="preserve">
     <value>歌词区域高度因子</value>
   </data>
@@ -1149,6 +1194,9 @@
   <data name="SettingsPageLyricsVerticalEdgeOpacity.Header" xml:space="preserve">
     <value>上下边缘不透明度</value>
   </data>
+  <data name="SettingsPageLyricsWindow.Text" xml:space="preserve">
+    <value>歌词窗口</value>
+  </data>
   <data name="SettingsPageLyricsWindowManager.Text" xml:space="preserve">
     <value>歌词窗口管理</value>
   </data>
@@ -1191,6 +1239,15 @@
   <data name="SettingsPageMockMusicPlaying.Header" xml:space="preserve">
     <value>播放测试音乐</value>
   </data>
+  <data name="SettingsPageMultiNowPlayingWindows.Header" xml:space="preserve">
+    <value>多窗口共存模式</value>
+  </data>
+  <data name="SettingsPageMusicGallery.Text" xml:space="preserve">
+    <value>音乐库</value>
+  </data>
+  <data name="SettingsPageMusicGalleryLyrics.Header" xml:space="preserve">
+    <value>音乐库内嵌歌词窗口</value>
+  </data>
   <data name="SettingsPageMusicLib.Description" xml:space="preserve">
     <value>添加存放音乐或歌词的文件夹</value>
   </data>
@@ -1239,6 +1296,9 @@
   <data name="SettingsPagePathNotFound.Text" xml:space="preserve">
     <value>无法在您的计算机中找到该路径</value>
   </data>
+  <data name="SettingsPagePatrons.Text" xml:space="preserve">
+    <value>特别鸣谢</value>
+  </data>
   <data name="SettingsPagePhonetic.Text" xml:space="preserve">
     <value>歌词注音</value>
   </data>
@@ -1254,9 +1314,6 @@
   <data name="SettingsPagePlaybackNotFound.Text" xml:space="preserve">
     <value>没有捕获的播放源</value>
   </data>
-  <data name="SettingsPagePlaybackShortcut.Text" xml:space="preserve">
-    <value>播放</value>
-  </data>
   <data name="SettingsPagePlaybackSource.Header" xml:space="preserve">
     <value>播放源</value>
   </data>
@@ -1362,6 +1419,9 @@
   <data name="SettingsPageShareHub.Content" xml:space="preserve">
     <value>浏览在线资源共享中心</value>
   </data>
+  <data name="SettingsPageShortcut.Text" xml:space="preserve">
+    <value>快捷键</value>
+  </data>
   <data name="SettingsPageShortcutRegFailInfo" xml:space="preserve">
     <value>该热键未成功注册</value>
   </data>
@@ -1389,6 +1449,9 @@
   <data name="SettingsPageShowTitle.Header" xml:space="preserve">
     <value>显示标题</value>
   </data>
+  <data name="SettingsPageSlide.Content" xml:space="preserve">
+    <value>滑动</value>
+  </data>
   <data name="SettingsPageSliderPrefix.Text" xml:space="preserve">
     <value>当前值： </value>
   </data>
@@ -1431,6 +1494,9 @@
   <data name="SettingsPageStandardMode.Text" xml:space="preserve">
     <value>标准模式</value>
   </data>
+  <data name="SettingsPageStartup.Text" xml:space="preserve">
+    <value>启动</value>
+  </data>
   <data name="SettingsPageStrokeFontColor.Header" xml:space="preserve">
     <value>描边颜色</value>
   </data>
@@ -1446,6 +1512,12 @@
   <data name="SettingsPageTelegram.Content" xml:space="preserve">
     <value>Telegram</value>
   </data>
+  <data name="SettingsPageThanksForPurchasing.Text" xml:space="preserve">
+    <value>感谢您购买 BetterLyrics</value>
+  </data>
+  <data name="SettingsPageThanksList.Header" xml:space="preserve">
+    <value>致谢名单</value>
+  </data>
   <data name="SettingsPageTheme.Header" xml:space="preserve">
     <value>歌词背景主题</value>
   </data>
@@ -1515,6 +1587,9 @@
   <data name="SettingsPageWorkAreaHeight.Header" xml:space="preserve">
     <value>工作区高度</value>
   </data>
+  <data name="SettingsPageYouNowUsing.Text" xml:space="preserve">
+    <value>正在使用该软件的你</value>
+  </data>
   <data name="StandardMode" xml:space="preserve">
     <value>标准模式</value>
   </data>

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Strings/zh-TW/Resources.resw

@@ -153,9 +153,6 @@
   <data name="DemoWindowControlDefault.Text" xml:space="preserve">
     <value>預設</value>
   </data>
-  <data name="DependenciesSettingsExpander.Header" xml:space="preserve">
-    <value>依賴</value>
-  </data>
   <data name="DesktopMode" xml:space="preserve">
     <value>桌面模式（透明）</value>
   </data>
@@ -198,6 +195,9 @@
   <data name="Jyutping" xml:space="preserve">
     <value>粵語拼音</value>
   </data>
+  <data name="KeepAtLeastOneStatusDefault" xml:space="preserve">
+    <value>請確保至少有一個狀態被設為預設</value>
+  </data>
   <data name="LastFMAuthFailed" xml:space="preserve">
     <value>授權失敗，請重試</value>
   </data>
@@ -240,22 +240,22 @@
   <data name="LyricsPageLyricsProviderPrefix.Header" xml:space="preserve">
     <value>歌詞來源</value>
   </data>
-  <data name="LyricsPageLyricsSearchButtonToolTip.Content" xml:space="preserve">
+  <data name="LyricsPageLyricsSearch.Text" xml:space="preserve">
     <value>手動檢索歌詞</value>
   </data>
-  <data name="LyricsPageLyricsSettingsButtonToolTip.Content" xml:space="preserve">
+  <data name="LyricsPageLyricsSettings.Text" xml:space="preserve">
     <value>歌詞視窗管理快捷設定</value>
   </data>
   <data name="LyricsPageMatchPercentage.Header" xml:space="preserve">
     <value>匹配百分比</value>
   </data>
-  <data name="LyricsPagePlaybackSourceButtonToolTip.Content" xml:space="preserve">
+  <data name="LyricsPagePlaybackSource.Text" xml:space="preserve">
     <value>播放源快捷設置</value>
   </data>
   <data name="LyricsPagePositionOffsetHint.Header" xml:space="preserve">
     <value>切換歌曲時重置為 0</value>
   </data>
-  <data name="LyricsPageSettingsButtonToolTip.Content" xml:space="preserve">
+  <data name="LyricsPageSettings.Text" xml:space="preserve">
     <value>設定</value>
   </data>
   <data name="LyricsPageTimelineOffsetButtonToolTip.Content" xml:space="preserve">
@@ -276,6 +276,9 @@
   <data name="LyricsPageTranslationProviderPrefix.Header" xml:space="preserve">
     <value>翻譯來源</value>
   </data>
+  <data name="LyricsPageTransliterationProviderPrefix.Header" xml:space="preserve">
+    <value>音譯來源</value>
+  </data>
   <data name="LyricsParseError" xml:space="preserve">
     <value>歌詞解析失敗</value>
   </data>
@@ -342,8 +345,8 @@
   <data name="LyricsWindowImmersiveButtonToolTip.Content" xml:space="preserve">
     <value>沉浸模式</value>
   </data>
-  <data name="LyricsWindowSettingsControlCurrentLyricsWindowConfig.Text" xml:space="preserve">
-    <value>目前歌詞視窗設定</value>
+  <data name="LyricsWindowSettingsControlLyricsWindowConfig.Text" xml:space="preserve">
+    <value>配置</value>
   </data>
   <data name="LyricsWindowSettingsControlLyricsWindowMode.Header" xml:space="preserve">
     <value>歌詞視窗模式</value>
@@ -487,7 +490,7 @@
     <value>單曲循環</value>
   </data>
   <data name="MusicGalleryPageSongSearchBox.PlaceholderText" xml:space="preserve">
-    <value>搜尋歌曲名稱、藝人、專輯或所在資料夾路徑</value>
+    <value>搜尋歌曲名稱、藝人、專輯、檔案名稱或檔案所在資料夾路徑</value>
   </data>
   <data name="MusicGalleryPageSortByAlbum.Content" xml:space="preserve">
     <value>專輯</value>
@@ -513,6 +516,12 @@
   <data name="MusicGalleryPageTitle" xml:space="preserve">
     <value>音樂庫 - BetterLyrics</value>
   </data>
+  <data name="MusicGalleryWindowDownButtonToolTip.Content" xml:space="preserve">
+    <value>收回</value>
+  </data>
+  <data name="MusicGalleryWindowUpButtonToolTip.Content" xml:space="preserve">
+    <value>展開</value>
+  </data>
   <data name="NarrowMode" xml:space="preserve">
     <value>窄螢幕模式</value>
   </data>
@@ -534,6 +543,9 @@
   <data name="SetingsPageContributors.Text" xml:space="preserve">
     <value>貢獻者</value>
   </data>
+  <data name="SetingsPageDeps.Text" xml:space="preserve">
+    <value>依賴包</value>
+  </data>
   <data name="SetingsPageDonation.Text" xml:space="preserve">
     <value>捐贈</value>
   </data>
@@ -582,6 +594,9 @@
   <data name="SettingsPageAlbumArt.Text" xml:space="preserve">
     <value>專輯</value>
   </data>
+  <data name="SettingsPageAlbumArtHeight.Header" xml:space="preserve">
+    <value>專輯圖片高度</value>
+  </data>
   <data name="SettingsPageAlbumArtLayer.Header" xml:space="preserve">
     <value>相簿藝術圖層</value>
   </data>
@@ -591,6 +606,9 @@
   <data name="SettingsPageAlbumArtSize.Header" xml:space="preserve">
     <value>相簿藝術尺寸</value>
   </data>
+  <data name="SettingsPageAlbumEffect.Text" xml:space="preserve">
+    <value>專輯區域動效</value>
+  </data>
   <data name="SettingsPageAlbumLib.Content" xml:space="preserve">
     <value>專輯封面來源</value>
   </data>
@@ -633,6 +651,9 @@
   <data name="SettingsPageAutoAdjust.Header" xml:space="preserve">
     <value>自動調整</value>
   </data>
+  <data name="SettingsPageAutoOpenLyricsWindow.Header" xml:space="preserve">
+    <value>程式啟動時自動開啟預設歌詞視窗</value>
+  </data>
   <data name="SettingsPageAutoOpenMusicGalleryWindow.Header" xml:space="preserve">
     <value>應用程式啟動時開啟音樂庫視窗</value>
   </data>
@@ -654,9 +675,6 @@
   <data name="SettingsPageBackgroundOverlay.Text" xml:space="preserve">
     <value>歌詞背景</value>
   </data>
-  <data name="SettingsPageBlurAmount.Header" xml:space="preserve">
-    <value>模糊度</value>
-  </data>
   <data name="SettingsPageBorderless.Header" xml:space="preserve">
     <value>無邊框窗口</value>
   </data>
@@ -702,6 +720,9 @@
   <data name="SettingsPageClickThroughHotKey.Header" xml:space="preserve">
     <value>點選穿透快捷鍵</value>
   </data>
+  <data name="SettingsPageCloseStatus.Text" xml:space="preserve">
+    <value>關閉</value>
+  </data>
   <data name="SettingsPageCollapseDropdown.Content" xml:space="preserve">
     <value>收起下拉列表</value>
   </data>
@@ -714,12 +735,18 @@
   <data name="SettingsPageConfigName.Header" xml:space="preserve">
     <value>配置名稱</value>
   </data>
+  <data name="SettingsPageConfigPlaybackSource.Text" xml:space="preserve">
+    <value>配置播放來源</value>
+  </data>
   <data name="SettingsPageCreateFromCurrent.Text" xml:space="preserve">
     <value>複製</value>
   </data>
   <data name="SettingsPageCreateFromTemplates.Content" xml:space="preserve">
     <value>從範本建立</value>
   </data>
+  <data name="SettingsPageCrossfade.Content" xml:space="preserve">
+    <value>交叉淡入淡出</value>
+  </data>
   <data name="SettingsPageCurrentLyricsWindowStatus.Text" xml:space="preserve">
     <value>當前歌詞窗口狀態</value>
   </data>
@@ -807,6 +834,12 @@
   <data name="SettingsPageEasingTypeSmoothStep.Content" xml:space="preserve">
     <value>平滑步進</value>
   </data>
+  <data name="SettingsPageEffectLineStartToCurrentChar.Content" xml:space="preserve">
+    <value>行首到當前字符</value>
+  </data>
+  <data name="SettingsPageEffectScopeLongDurationSyllable.Content" xml:space="preserve">
+    <value>長時間的音節</value>
+  </data>
   <data name="SettingsPageEN.Content" xml:space="preserve">
     <value>English</value>
   </data>
@@ -825,6 +858,9 @@
   <data name="SettingsPageEnvColorSampleInner.Content" xml:space="preserve">
     <value>視窗內部</value>
   </data>
+  <data name="SettingsPageExitOnGalleryWindowClosed.Header" xml:space="preserve">
+    <value>關閉音樂庫視窗時退出程式</value>
+  </data>
   <data name="SettingsPageExitOnLyricsWindowClosed.Header" xml:space="preserve">
     <value>關閉歌詞視窗時退出程式</value>
   </data>
@@ -879,6 +915,9 @@
   <data name="SettingsPageHeight.Header" xml:space="preserve">
     <value>高度</value>
   </data>
+  <data name="SettingsPageHello.Text" xml:space="preserve">
+    <value>您好</value>
+  </data>
   <data name="SettingsPageHideWindow.Description" xml:space="preserve">
     <value>音樂未播放/播放時自動隱藏/顯示歌詞視窗</value>
   </data>
@@ -891,6 +930,9 @@
   <data name="SettingsPageHorizontalLayoutFactor.Text" xml:space="preserve">
     <value>水平布局系數</value>
   </data>
+  <data name="SettingsPageImageSwitchType.Header" xml:space="preserve">
+    <value>專輯圖切換動畫</value>
+  </data>
   <data name="SettingsPageImport.Content" xml:space="preserve">
     <value>匯入</value>
   </data>
@@ -978,6 +1020,9 @@
   <data name="SettingsPageLog.Header" xml:space="preserve">
     <value>日誌記錄</value>
   </data>
+  <data name="SettingsPageLongSyllableDuration.Header" xml:space="preserve">
+    <value>長音節閾值</value>
+  </data>
   <data name="SettingsPageLXMusicServer.Header" xml:space="preserve">
     <value>LX 音樂服務器</value>
   </data>
@@ -996,18 +1041,18 @@
   <data name="SettingsPageLyricsBlack.Content" xml:space="preserve">
     <value>黑體</value>
   </data>
-  <data name="SettingsPageLyricsBlurAmount.Header" xml:space="preserve">
-    <value>模糊度</value>
+  <data name="SettingsPageLyricsBlurEffect.Description" xml:space="preserve">
+    <value>為非目前行啟用模糊效果</value>
   </data>
-  <data name="SettingsPageLyricsBlurAmountSideEffect.Text" xml:space="preserve">
-    <value>調整此數值將同步提升專輯圖片背景模糊強度</value>
-  </data>
-  <data name="SettingsPageLyricsBlurHighGPUUsage.Text" xml:space="preserve">
-    <value>啟用模糊（&gt; 0）時將顯著提升 GPU 佔用率</value>
+  <data name="SettingsPageLyricsBlurEffect.Header" xml:space="preserve">
+    <value>模糊效果</value>
   </data>
   <data name="SettingsPageLyricsBold.Content" xml:space="preserve">
     <value>粗體</value>
   </data>
+  <data name="SettingsPageLyricsCenterTopOffset.Header" xml:space="preserve">
+    <value>目前行位置</value>
+  </data>
   <data name="SettingsPageLyricsColFactor.Header" xml:space="preserve">
     <value>歌詞區域寬度因子</value>
   </data>
@@ -1048,7 +1093,7 @@
     <value>自定義</value>
   </data>
   <data name="SettingsPageLyricsFontFamily.Header" xml:space="preserve">
-    <value>歌詞字體</value>
+    <value>字體家族</value>
   </data>
   <data name="SettingsPageLyricsFontSize.Header" xml:space="preserve">
     <value>字體大小</value>
@@ -1059,9 +1104,6 @@
   <data name="SettingsPageLyricsFontWeight.Header" xml:space="preserve">
     <value>字體粗細</value>
   </data>
-  <data name="SettingsPageLyricsGlowEffect.Description" xml:space="preserve">
-    <value>為持續時間較長的音節啟用發光效果</value>
-  </data>
   <data name="SettingsPageLyricsGlowEffect.Header" xml:space="preserve">
     <value>輝光效果</value>
   </data>
@@ -1092,6 +1134,9 @@
   <data name="SettingsPageLyricsNormal.Content" xml:space="preserve">
     <value>常規</value>
   </data>
+  <data name="SettingsPageLyricsOpacity.Header" xml:space="preserve">
+    <value>字體不透明度</value>
+  </data>
   <data name="SettingsPageLyricsRowFactor.Header" xml:space="preserve">
     <value>歌詞區域高度因子</value>
   </data>
@@ -1149,6 +1194,9 @@
   <data name="SettingsPageLyricsVerticalEdgeOpacity.Header" xml:space="preserve">
     <value>上下邊緣不透明度</value>
   </data>
+  <data name="SettingsPageLyricsWindow.Text" xml:space="preserve">
+    <value>歌詞視窗</value>
+  </data>
   <data name="SettingsPageLyricsWindowManager.Text" xml:space="preserve">
     <value>歌詞視窗管理</value>
   </data>
@@ -1191,6 +1239,15 @@
   <data name="SettingsPageMockMusicPlaying.Header" xml:space="preserve">
     <value>播放測試音樂</value>
   </data>
+  <data name="SettingsPageMultiNowPlayingWindows.Header" xml:space="preserve">
+    <value>多視窗共存模式</value>
+  </data>
+  <data name="SettingsPageMusicGallery.Text" xml:space="preserve">
+    <value>音樂庫</value>
+  </data>
+  <data name="SettingsPageMusicGalleryLyrics.Header" xml:space="preserve">
+    <value>音樂庫內嵌歌詞視窗</value>
+  </data>
   <data name="SettingsPageMusicLib.Description" xml:space="preserve">
     <value>新增存放音樂或歌詞的資料夾</value>
   </data>
@@ -1213,7 +1270,7 @@
     <value>激進</value>
   </data>
   <data name="SettingsPageOpacity.Header" xml:space="preserve">
-    <value>專輯背景層不透明度</value>
+    <value>不透明度</value>
   </data>
   <data name="SettingsPageOpenFolderButton.Content" xml:space="preserve">
     <value>在檔案總管中開啟</value>
@@ -1239,6 +1296,9 @@
   <data name="SettingsPagePathNotFound.Text" xml:space="preserve">
     <value>無法在您的電腦中找到該路徑</value>
   </data>
+  <data name="SettingsPagePatrons.Text" xml:space="preserve">
+    <value>特別鳴謝</value>
+  </data>
   <data name="SettingsPagePhonetic.Text" xml:space="preserve">
     <value>歌詞注音</value>
   </data>
@@ -1254,9 +1314,6 @@
   <data name="SettingsPagePlaybackNotFound.Text" xml:space="preserve">
     <value>沒有捕獲的播放源</value>
   </data>
-  <data name="SettingsPagePlaybackShortcut.Text" xml:space="preserve">
-    <value>播放</value>
-  </data>
   <data name="SettingsPagePlaybackSource.Header" xml:space="preserve">
     <value>播放源</value>
   </data>
@@ -1362,6 +1419,9 @@
   <data name="SettingsPageShareHub.Content" xml:space="preserve">
     <value>瀏覽線上資源分享中心</value>
   </data>
+  <data name="SettingsPageShortcut.Text" xml:space="preserve">
+    <value>快速鍵</value>
+  </data>
   <data name="SettingsPageShortcutRegFailInfo" xml:space="preserve">
     <value>該熱鍵未成功註冊</value>
   </data>
@@ -1389,6 +1449,9 @@
   <data name="SettingsPageShowTitle.Header" xml:space="preserve">
     <value>顯示標題</value>
   </data>
+  <data name="SettingsPageSlide.Content" xml:space="preserve">
+    <value>滑動</value>
+  </data>
   <data name="SettingsPageSliderPrefix.Text" xml:space="preserve">
     <value>目前值： </value>
   </data>
@@ -1431,6 +1494,9 @@
   <data name="SettingsPageStandardMode.Text" xml:space="preserve">
     <value>標準模式</value>
   </data>
+  <data name="SettingsPageStartup.Text" xml:space="preserve">
+    <value>啟動</value>
+  </data>
   <data name="SettingsPageStrokeFontColor.Header" xml:space="preserve">
     <value>描邊顏色</value>
   </data>
@@ -1446,6 +1512,12 @@
   <data name="SettingsPageTelegram.Content" xml:space="preserve">
     <value>Telegram</value>
   </data>
+  <data name="SettingsPageThanksForPurchasing.Text" xml:space="preserve">
+    <value>感謝您購買 BetterLyrics</value>
+  </data>
+  <data name="SettingsPageThanksList.Header" xml:space="preserve">
+    <value>致謝名單</value>
+  </data>
   <data name="SettingsPageTheme.Header" xml:space="preserve">
     <value>歌詞背景主題</value>
   </data>
@@ -1515,6 +1587,9 @@
   <data name="SettingsPageWorkAreaHeight.Header" xml:space="preserve">
     <value>工作區域高度</value>
   </data>
+  <data name="SettingsPageYouNowUsing.Text" xml:space="preserve">
+    <value>正在使用該軟體的你</value>
+  </data>
   <data name="StandardMode" xml:space="preserve">
     <value>標準模式</value>
   </data>

BetterLyrics.WinUI3/BetterLyrics.WinUI3/ViewModels/AboutControlViewModel.cs

@@ -10,33 +10,28 @@ using CommunityToolkit.Mvvm.Input;
 using Microsoft.UI.Xaml.Controls;
 using System;
 using System.Threading.Tasks;
+using Windows.Services.Store;
+using Windows.System;
 
 namespace BetterLyrics.WinUI3.ViewModels
 {
     public partial class AboutControlViewModel : BaseViewModel
     {
         private readonly ISettingsService _settingsService;
-        private readonly IResourceService _resourceService;
-
-        [ObservableProperty]
-        [NotifyPropertyChangedRecipients]
-        public partial bool IsDebugOverlayEnabled { get; set; } = false;
 
         [ObservableProperty]
         public partial AppSettings AppSettings { get; set; }
 
-        public AboutControlViewModel(ISettingsService settingsService, IResourceService resourceService)
+        public AboutControlViewModel(ISettingsService settingsService)
         {
             _settingsService = settingsService;
-            _resourceService = resourceService;
-
             AppSettings = _settingsService.AppSettings;
         }
 
         [RelayCommand]
         private async Task LaunchProjectGitHubPageAsync()
         {
-            await Windows.System.Launcher.LaunchUriAsync(new Uri(Constants.Link.GitHub));
+            await Windows.System.Launcher.LaunchUriAsync(new Uri(Constants.Link.BetterLyricsGitHub));
         }
 
         [RelayCommand]

BetterLyrics.WinUI3/BetterLyrics.WinUI3/ViewModels/LyricsSearchControlViewModel.cs

@@ -180,8 +180,7 @@ namespace BetterLyrics.WinUI3.ViewModels
             if (value?.Raw != null)
             {
                 var lyricsParser = new LyricsParser();
-                lyricsParser.Parse(_mediaSessionsService.CurrentSongInfo, value);
-                LyricsDataArr = [.. lyricsParser.LyricsDataArr];
+                LyricsDataArr = [.. lyricsParser.Parse(value)];
             }
             else
             {

BetterLyrics.WinUI3/BetterLyrics.WinUI3/ViewModels/LyricsWindowSettingsControlViewModel.cs

@@ -1,33 +1,27 @@
 using BetterLyrics.WinUI3.Extensions;
 using BetterLyrics.WinUI3.Hooks;
-using BetterLyrics.WinUI3.Models;
 using BetterLyrics.WinUI3.Models.Settings;
-using BetterLyrics.WinUI3.Services.LiveStatesService;
 using BetterLyrics.WinUI3.Services.SettingsService;
+using BetterLyrics.WinUI3.Views;
 using CommunityToolkit.Mvvm.ComponentModel;
 using CommunityToolkit.Mvvm.Input;
-using System.Collections.ObjectModel;
+using CommunityToolkit.Mvvm.Messaging;
+using CommunityToolkit.Mvvm.Messaging.Messages;
 using System.Linq;
 using System.Numerics;
 
 namespace BetterLyrics.WinUI3.ViewModels
 {
-    public partial class LyricsWindowSettingsControlViewModel : BaseViewModel
+    public partial class LyricsWindowSettingsControlViewModel : BaseViewModel,
+        IRecipient<PropertyChangedMessage<bool>>
     {
         private readonly ISettingsService _settingsService;
-        private readonly ILiveStatesService _liveStatesService;
-
-        [ObservableProperty]
-        public partial LiveStates LiveStates { get; set; }
 
         [ObservableProperty]
         public partial AppSettings AppSettings { get; set; }
 
         [ObservableProperty]
-        public partial object ListViewSelectedItemTag { get; set; } = "General";
-
-        [ObservableProperty]
-        public partial ObservableCollection<string> MonitorDeviceNames { get; set; }
+        public partial object SelectorBarSelectedItemTag { get; set; } = "AlbumArtStyle";
 
         [ObservableProperty]
         public partial bool IsConfigPanelOpened { get; set; } = false;
@@ -38,21 +32,11 @@ namespace BetterLyrics.WinUI3.ViewModels
         [ObservableProperty]
         public partial double DisplayPanelHeight { get; set; } = 0;
 
-        public LyricsWindowSettingsControlViewModel(ISettingsService settingsService, ILiveStatesService liveStatesService)
+        public LyricsWindowSettingsControlViewModel(ISettingsService settingsService)
         {
             _settingsService = settingsService;
-            _liveStatesService = liveStatesService;
 
             AppSettings = _settingsService.AppSettings;
-            LiveStates = _liveStatesService.LiveStates;
-            MonitorDeviceNames = [.. MonitorHook.GetAllMonitorDeviceNames()];
-        }
-
-        [RelayCommand]
-        private void RefreshMonitorDeviceNames()
-        {
-            MonitorDeviceNames = [.. MonitorHook.GetAllMonitorDeviceNames()];
-            LiveStates.LyricsWindowStatus?.MonitorDeviceName = MonitorDeviceNames.FirstOrDefault() ?? "";
         }
 
         [RelayCommand]
@@ -85,8 +69,7 @@ namespace BetterLyrics.WinUI3.ViewModels
             AppSettings.WindowBoundsRecords.Add(LyricsWindowStatusExtensions.NarrowMode());
         }
 
-        [RelayCommand]
-        private void OpenConfigPanel()
+        public void OpenConfigPanel()
         {
             IsConfigPanelOpened = true;
             ConfigPanelTranslation = new();
@@ -110,5 +93,27 @@ namespace BetterLyrics.WinUI3.ViewModels
                 CloseConfigPanel();
             }
         }
+
+        public void Receive(PropertyChangedMessage<bool> message)
+        {
+            if (message.Sender is GeneralSettings)
+            {
+                if (message.PropertyName == nameof(GeneralSettings.MultiNowPlayingWindowMode))
+                {
+                    if (!message.NewValue && AppSettings.WindowBoundsRecords.Count(x => x.IsOpened) > 0)
+                    {
+                        var windows = WindowHook.GetWindows<NowPlayingWindow>();
+                        var latest = windows.Last();
+                        foreach (var item in windows)
+                        {
+                            if (item != latest)
+                            {
+                                item.CloseWindow();
+                            }
+                        }
+                    }
+                }
+            }
+        }
     }
 }

BetterLyrics.WinUI3/BetterLyrics.WinUI3/ViewModels/LyricsWindowSwitchControlViewModel.cs

@@ -1,6 +1,4 @@
-using BetterLyrics.WinUI3.Models;
-using BetterLyrics.WinUI3.Models.Settings;
-using BetterLyrics.WinUI3.Services.LiveStatesService;
+using BetterLyrics.WinUI3.Models.Settings;
 using BetterLyrics.WinUI3.Services.SettingsService;
 using CommunityToolkit.Mvvm.ComponentModel;
 
@@ -9,21 +7,14 @@ namespace BetterLyrics.WinUI3.ViewModels
     public partial class LyricsWindowSwitchControlViewModel : BaseViewModel
     {
         private readonly ISettingsService _settingsService;
-        private readonly ILiveStatesService _liveStatesService;
-
-        [ObservableProperty]
-        public partial LiveStates LiveStates { get; set; }
-
 
         [ObservableProperty]
         public partial AppSettings AppSettings { get; set; }
 
-        public LyricsWindowSwitchControlViewModel(ISettingsService settingsService, ILiveStatesService liveStatesService)
+        public LyricsWindowSwitchControlViewModel(ISettingsService settingsService)
         {
             _settingsService = settingsService;
-            _liveStatesService = liveStatesService;
             AppSettings = _settingsService.AppSettings;
-            LiveStates = _liveStatesService.LiveStates;
         }
 
     }

BetterLyrics.WinUI3/BetterLyrics.WinUI3/ViewModels/MusicGalleryPageViewModel.cs

@@ -30,7 +30,7 @@ using Windows.Storage;
 
 namespace BetterLyrics.WinUI3.ViewModels
 {
-    public partial class MusicGalleryViewModel : BaseViewModel
+    public partial class MusicGalleryPageViewModel : BaseViewModel
     {
         private readonly ILibWatcherService _libWatcherService;
         private readonly ISettingsService _settingsService;
@@ -72,6 +72,9 @@ namespace BetterLyrics.WinUI3.ViewModels
 
         public PlayQueueItem? PlayingQueueItem => TrackPlayingQueue.ElementAtOrDefault(AppSettings.MusicGallerySettings.PlayQueueIndex);
 
+        [ObservableProperty]
+        public partial Track? PlayingTrack { get; set; } = null;
+
         [ObservableProperty]
         public partial CommonSongProperty SongOrderType { get; set; } = CommonSongProperty.Title;
 
@@ -92,7 +95,7 @@ namespace BetterLyrics.WinUI3.ViewModels
         [ObservableProperty]
         public partial string SongSearchQuery { get; set; } = string.Empty;
 
-        public MusicGalleryViewModel(ISettingsService settingsService, ILibWatcherService libWatcherService, IResourceService resourceService)
+        public MusicGalleryPageViewModel(ISettingsService settingsService, ILibWatcherService libWatcherService, IResourceService resourceService)
         {
             _refreshSongsTimer = _dispatcherQueue.CreateTimer();
 
@@ -127,11 +130,6 @@ namespace BetterLyrics.WinUI3.ViewModels
 
             _libWatcherService = libWatcherService;
             _libWatcherService.MusicLibraryFilesChanged += LibWatcherService_MusicLibraryFilesChanged;
-
-            if (AppSettings.MusicGallerySettings.AutoPlay)
-            {
-                _ = PlayTrackAtAsync(AppSettings.MusicGallerySettings.PlayQueueIndex);
-            }
         }
 
         private void TrackPlayingQueue_CollectionChanged(object? sender, System.Collections.Specialized.NotifyCollectionChangedEventArgs e)
@@ -376,6 +374,9 @@ namespace BetterLyrics.WinUI3.ViewModels
                     t.Title.Contains(SongSearchQuery, StringComparison.OrdinalIgnoreCase) ||
                     t.Artist.Contains(SongSearchQuery, StringComparison.OrdinalIgnoreCase) ||
                     t.Album.Contains(SongSearchQuery, StringComparison.OrdinalIgnoreCase) ||
+                    // 文件名（包含后缀）
+                    t.GetFileName().Contains(SongSearchQuery, StringComparison.OrdinalIgnoreCase) ||
+                    // 文件所在文件夹的路径
                     t.GetParentFolderPath().Contains(SongSearchQuery, StringComparison.OrdinalIgnoreCase)).ToList();
         }
 
@@ -440,20 +441,20 @@ namespace BetterLyrics.WinUI3.ViewModels
             }
             else
             {
-                var track = playQueueItem.Track;
+                PlayingTrack = playQueueItem.Track;
 
                 var updater = _smtc.DisplayUpdater;
                 updater.ClearAll();
 
                 _smtc.IsEnabled = true;
-                _mediaPlayer.Source = MediaSource.CreateFromUri(new Uri(track.Path));
+                _mediaPlayer.Source = MediaSource.CreateFromUri(new Uri(PlayingTrack.Path));
 
-                var storageFile = await StorageFile.GetFileFromPathAsync(track.Path);
+                var storageFile = await StorageFile.GetFileFromPathAsync(PlayingTrack.Path);
 
                 await updater.CopyFromFileAsync(MediaPlaybackType.Music, storageFile);
                 updater.AppMediaId = Package.Current.Id.FullName;
-                updater.MusicProperties.AlbumTitle = track.Album;
-                updater.MusicProperties.Genres.Add($"{ExtendedGenreFiled.FileName}{Path.GetFileNameWithoutExtension(track.Path)}");
+                updater.MusicProperties.AlbumTitle = PlayingTrack.Album;
+                updater.MusicProperties.Genres.Add($"{ExtendedGenreFiled.FileName}{Path.GetFileNameWithoutExtension(PlayingTrack.Path)}");
                 updater.Update();
             }
         }

BetterLyrics.WinUI3/BetterLyrics.WinUI3/ViewModels/MusicGalleryWindowViewModel.cs

@@ -0,0 +1,22 @@
+using BetterLyrics.WinUI3.Models.Settings;
+using BetterLyrics.WinUI3.Services.SettingsService;
+using CommunityToolkit.Mvvm.ComponentModel;
+
+namespace BetterLyrics.WinUI3.ViewModels
+{
+    public partial class MusicGalleryWindowViewModel : BaseViewModel
+    {
+        private readonly ISettingsService _settingsService;
+
+        [ObservableProperty]
+        public partial AppSettings AppSettings { get; set; }
+
+        public MusicGalleryWindowViewModel(ISettingsService settingsService)
+        {
+            _settingsService = settingsService;
+
+            AppSettings = _settingsService.AppSettings;
+        }
+
+    }
+}

BetterLyrics.WinUI3/BetterLyrics.WinUI3/ViewModels/NowPlayingBarViewModel.cs

@@ -0,0 +1,89 @@
+using BetterLyrics.WinUI3.Hooks;
+using BetterLyrics.WinUI3.Models;
+using BetterLyrics.WinUI3.Services.MediaSessionsService;
+using BetterLyrics.WinUI3.Views;
+using CommunityToolkit.Mvvm.ComponentModel;
+using CommunityToolkit.Mvvm.Input;
+using System.Threading.Tasks;
+
+namespace BetterLyrics.WinUI3.ViewModels
+{
+    public partial class NowPlayingBarViewModel : BaseViewModel
+    {
+        public IMediaSessionsService MediaSessionsService { get; private set; }
+
+        [ObservableProperty]
+        public partial int Volume { get; set; }
+
+        [ObservableProperty]
+        public partial float TimelineSliderThumbOpacity { get; set; } = 0f;
+
+        [ObservableProperty]
+        public partial LyricsLine? TimelineSliderThumbLyricsLine { get; set; }
+
+        [ObservableProperty]
+        public partial double TimelineSliderThumbSeconds { get; set; } = 0;
+
+        [ObservableProperty]
+        public partial double BottomCommandGridOpacity { get; set; } = 1;
+
+        [ObservableProperty]
+        public partial double BottomCommandFlyoutTriggerOpacity { get; set; }
+
+        public NowPlayingBarViewModel(IMediaSessionsService mediaSessionsService)
+        {
+            MediaSessionsService = mediaSessionsService;
+
+            Volume = SystemVolumeHook.MasterVolume;
+            SystemVolumeHook.VolumeNotification += SystemVolumeHelper_VolumeNotification;
+        }
+
+        private void SystemVolumeHelper_VolumeNotification(object? sender, int e)
+        {
+            Volume = e;
+        }
+
+        partial void OnTimelineSliderThumbSecondsChanged(double value)
+        {
+            TimelineSliderThumbLyricsLine = MediaSessionsService.CurrentLyricsData?.GetLyricsLine(value);
+        }
+
+
+        [RelayCommand]
+        private async Task PlaySongAsync()
+        {
+            await MediaSessionsService.PlayAsync();
+        }
+
+        [RelayCommand]
+        private async Task PauseSongAsync()
+        {
+            await MediaSessionsService.PauseAsync();
+        }
+
+        [RelayCommand]
+        private async Task PreviousSongAsync()
+        {
+            await MediaSessionsService.PreviousAsync();
+        }
+
+        [RelayCommand]
+        private async Task NextSongAsync()
+        {
+            await MediaSessionsService.NextAsync();
+        }
+
+        [RelayCommand]
+        private static void OpenSettingsWindow()
+        {
+            WindowHook.OpenOrShowWindow<SettingsWindow>();
+        }
+
+        [RelayCommand]
+        private static void OpenLyricsSearchWindow()
+        {
+            WindowHook.OpenOrShowWindow<LyricsSearchWindow>();
+        }
+
+    }
+}

BetterLyrics.WinUI3/BetterLyrics.WinUI3/ViewModels/NowPlayingPageViewModel.cs

@@ -1,61 +1,20 @@
 // 2025/6/23 by Zhe Fang
 
 using BetterLyrics.WinUI3.Hooks;
-using BetterLyrics.WinUI3.Models;
-using BetterLyrics.WinUI3.Services.LiveStatesService;
+
 using BetterLyrics.WinUI3.Services.MediaSessionsService;
 using BetterLyrics.WinUI3.Views;
-using CommunityToolkit.Mvvm.ComponentModel;
 using CommunityToolkit.Mvvm.Input;
-using System.Threading.Tasks;
 
 namespace BetterLyrics.WinUI3.ViewModels
 {
     public partial class NowPlayingPageViewModel : BaseViewModel
     {
         public IMediaSessionsService MediaSessionsService { get; private set; }
-        private readonly ILiveStatesService _liveStatesService;
 
-        [ObservableProperty]
-        public partial LiveStates LiveStates { get; set; }
-
-        [ObservableProperty]
-        public partial int Volume { get; set; }
-
-        [ObservableProperty]
-        public partial double BottomCommandGridOpacity { get; set; }
-
-        [ObservableProperty]
-        public partial double BottomCommandFlyoutTriggerOpacity { get; set; }
-
-        [ObservableProperty]
-        public partial float TimelineSliderThumbOpacity { get; set; } = 0f;
-
-        [ObservableProperty]
-        public partial LyricsLine? TimelineSliderThumbLyricsLine { get; set; }
-
-        [ObservableProperty]
-        public partial double TimelineSliderThumbSeconds { get; set; } = 0;
-
-        public NowPlayingPageViewModel(IMediaSessionsService mediaSessionsService, ILiveStatesService liveStatesService)
+        public NowPlayingPageViewModel(IMediaSessionsService mediaSessionsService)
         {
-            _liveStatesService = liveStatesService;
             MediaSessionsService = mediaSessionsService;
-
-            LiveStates = _liveStatesService.LiveStates;
-
-            Volume = SystemVolumeHook.MasterVolume;
-            SystemVolumeHook.VolumeNotification += SystemVolumeHelper_VolumeNotification;
-        }
-
-        private void SystemVolumeHelper_VolumeNotification(object? sender, int e)
-        {
-            Volume = e;
-        }
-
-        partial void OnTimelineSliderThumbSecondsChanged(double value)
-        {
-            TimelineSliderThumbLyricsLine = MediaSessionsService.CurrentLyricsData?.GetLyricsLine(value);
         }
 
         [RelayCommand]
@@ -64,29 +23,5 @@ namespace BetterLyrics.WinUI3.ViewModels
             WindowHook.OpenOrShowWindow<SettingsWindow>();
         }
 
-        [RelayCommand]
-        private async Task PlaySongAsync()
-        {
-            await MediaSessionsService.PlayAsync();
-        }
-
-        [RelayCommand]
-        private async Task PauseSongAsync()
-        {
-            await MediaSessionsService.PauseAsync();
-        }
-
-        [RelayCommand]
-        private async Task PreviousSongAsync()
-        {
-            await MediaSessionsService.PreviousAsync();
-        }
-
-        [RelayCommand]
-        private async Task NextSongAsync()
-        {
-            await MediaSessionsService.NextAsync();
-        }
-
     }
 }