add ani for fluid bg

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

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

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

@@ -84,7 +84,7 @@ namespace BetterLyrics.WinUI3
 
         protected override void OnLaunched(LaunchActivatedEventArgs args)
         {
-            WindowHelper.OpenWindow<LyricsWindow>();
+            WindowHelper.OpenOrShowWindow<LyricsWindow>();
         }
 
         private static void ConfigureServices()
@@ -113,12 +113,11 @@ namespace BetterLyrics.WinUI3
                     .AddSingleton<ILastFMService, LastFMService>()
                     // ViewModels
                     .AddSingleton<AppSettingsControlViewModel>()
-                    .AddSingleton<LyricsBackgroundSettingsControlViewModel>()
-                    .AddSingleton<AlbumArtLayoutSettingsControlViewModel>()
                     .AddSingleton<PlaybackSettingsControlViewModel>()
                     .AddSingleton<MediaSettingsControlViewModel>()
-                    .AddSingleton<AllLyricsSettingsControlViewModel>()
                     .AddSingleton<LyricsSearchControlViewModel>()
+                    .AddSingleton<LyricsWindowSettingsControlViewModel>()
+                    .AddSingleton<LyricsWindowSwitchControlViewModel>()
                     .AddSingleton<LyricsWindowViewModel>()
                     .AddSingleton<SettingsWindowViewModel>()
                     .AddSingleton<SystemTrayViewModel>()

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

@@ -20,19 +20,23 @@
 		<PRIResource Remove="ViewModels\Lyrics\**" />
 	</ItemGroup>
 	<ItemGroup>
+		<None Remove="Assets\effect.bin" />
 		<None Remove="Assets\Segoe Fluent Icons.ttf" />
 		<None Remove="Assets\Wiki82.profile.xml" />
 		<None Remove="Controls\AlbumArtLayoutSettingsControl.xaml" />
-		<None Remove="Controls\AllLyricsSettingsControl.xaml" />
 		<None Remove="Controls\AppSettingsControl.xaml" />
+		<None Remove="Controls\DemoWindowGrid.xaml" />
 		<None Remove="Controls\ExtendedSlider.xaml" />
 		<None Remove="Controls\LyricsSearchControl.xaml" />
 		<None Remove="Controls\LyricsSettingsControl.xaml" />
+		<None Remove="Controls\LyricsWindowSettingsControl.xaml" />
+		<None Remove="Controls\LyricsWindowSwitchControl.xaml" />
 		<None Remove="Controls\MediaSettingsControl.xaml" />
 		<None Remove="Controls\PlaybackSettingsControl.xaml" />
 		<None Remove="Controls\ShortcutTextBox.xaml" />
 		<None Remove="Controls\SystemTray.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" />
@@ -70,6 +74,7 @@
 		<PackageReference Include="Microsoft.Graphics.Win2D" Version="1.3.2" />
 		<PackageReference Include="Microsoft.Windows.SDK.BuildTools" Version="10.0.26100.4654" />
 		<PackageReference Include="Microsoft.WindowsAppSDK" Version="1.7.250606001" />
+		<PackageReference Include="NAudio.Wasapi" Version="2.2.1" />
 		<PackageReference Include="Nito.AsyncEx" Version="5.1.2" />
 		<PackageReference Include="Nito.AsyncEx.Tasks" Version="5.1.2" />
 		<PackageReference Include="NTextCat" Version="0.3.65" />
@@ -117,6 +122,9 @@
 	  <Content Update="Assets\Edge.png">
 	    <CopyToOutputDirectory>Always</CopyToOutputDirectory>
 	  </Content>
+	  <Content Update="Assets\effect.bin">
+	    <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+	  </Content>
 	  <Content Update="Assets\Empty.png">
 	    <CopyToOutputDirectory>Always</CopyToOutputDirectory>
 	  </Content>
@@ -141,6 +149,9 @@
 	  <Content Update="Assets\Leaf.png">
 	    <CopyToOutputDirectory>Always</CopyToOutputDirectory>
 	  </Content>
+	  <Content Update="Assets\Listen1.png">
+	    <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+	  </Content>
 	  <Content Update="Assets\Logo.ico">
 	    <CopyToOutputDirectory>Always</CopyToOutputDirectory>
 	  </Content>
@@ -153,6 +164,9 @@
 	  <Content Update="Assets\MediaPlayerWindows11.png">
 	    <CopyToOutputDirectory>Always</CopyToOutputDirectory>
 	  </Content>
+	  <Content Update="Assets\MoeKoeMusic.png">
+	    <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+	  </Content>
 	  <Content Update="Assets\MusicBee.png">
 	    <CopyToOutputDirectory>Always</CopyToOutputDirectory>
 	  </Content>
@@ -171,6 +185,9 @@
 	  <Content Update="Assets\Question.png">
 	    <CopyToOutputDirectory>Always</CopyToOutputDirectory>
 	  </Content>
+	  <Content Update="Assets\SaltPlayerForWindows.png">
+	    <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+	  </Content>
 	  <Content Update="Assets\Segoe Fluent Icons.ttf">
 	    <CopyToOutputDirectory>Always</CopyToOutputDirectory>
 	  </Content>
@@ -181,6 +198,26 @@
 	    <CopyToOutputDirectory>Always</CopyToOutputDirectory>
 	  </Content>
 	</ItemGroup>
+	<ItemGroup>
+	  <Page Update="Views\LyricsWindowSwitchWindow.xaml">
+	    <Generator>MSBuild:Compile</Generator>
+	  </Page>
+	</ItemGroup>
+	<ItemGroup>
+	  <Page Update="Controls\LyricsWindowSwitchControl.xaml">
+	    <Generator>MSBuild:Compile</Generator>
+	  </Page>
+	</ItemGroup>
+	<ItemGroup>
+	  <Page Update="Controls\DemoWindowGrid.xaml">
+	    <Generator>MSBuild:Compile</Generator>
+	  </Page>
+	</ItemGroup>
+	<ItemGroup>
+	  <Page Update="Controls\LyricsWindowSettingsControl.xaml">
+	    <Generator>MSBuild:Compile</Generator>
+	  </Page>
+	</ItemGroup>
 	<ItemGroup>
 	  <Page Update="Views\LyricsSearchWindow.xaml">
 	    <Generator>MSBuild:Compile</Generator>
@@ -201,11 +238,6 @@
 	    <Generator>MSBuild:Compile</Generator>
 	  </Page>
 	</ItemGroup>
-	<ItemGroup>
-	  <Page Update="Controls\AllLyricsSettingsControl.xaml">
-	    <Generator>MSBuild:Compile</Generator>
-	  </Page>
-	</ItemGroup>
 	<ItemGroup>
 	  <Page Update="Controls\LyricsSettingsControl.xaml">
 	    <Generator>MSBuild:Compile</Generator>
@@ -256,6 +288,11 @@
 			<Generator>MSBuild:Compile</Generator>
 		</Page>
 	</ItemGroup>
+	<ItemGroup>
+	  <PRIResource Update="Strings\en-US\Resources.resw">
+	    <Generator></Generator>
+	  </PRIResource>
+	</ItemGroup>
 	<!-- Publish Properties -->
 	<PropertyGroup>
 		<PublishReadyToRun Condition="'$(Configuration)' == 'Debug'">False</PublishReadyToRun>

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Constants/PlayerID.cs

@@ -26,5 +26,9 @@ namespace BetterLyrics.WinUI3.Constants
         public const string Edge = "MSEdge";
         public const string BetterLyrics = "37412.BetterLyrics_rd1g0rsrrtxw8!App";
         public const string BetterLyricsDebug = "37412.BetterLyrics_c8mj3v9sysxb4!App";
+        public const string SaltPlayerForWindows = "Sakawish.SaltPlayerforWindows_q65q631pyh094!SaltPlayerforWindows";
+        public const string MoeKoeMusic = "cn.MoeKoe.Music";
+        public const string MoeKoeMusicAlternative = "electron.app.MoeKoe Music";
+        public const string Listen1 = "com.listen1.listen1";
     }
 }

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Constants/PlayerName.cs

@@ -25,5 +25,8 @@ namespace BetterLyrics.WinUI3.Constants
         public const string Edge = "Microsoft Edge";
         public const string BetterLyrics = "BetterLyrics";
         public const string BetterLyricsDebug = "BetterLyrics (Debug)";
+        public const string SaltPlayerForWindows = "Salt Player for Windows";
+        public const string MoeKoeMusic = "MoeKoe Music";
+        public const string Listen1 = "Listen 1";
     }
 }

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Controls/AlbumArtLayoutSettingsControl.xaml

@@ -17,6 +17,27 @@
 
                     <TextBlock x:Uid="SettingsPageAlbumArt" Style="{StaticResource SettingsSectionHeaderTextBlockStyle}" />
 
+                    <controls:SettingsExpander
+                        x:Uid="SettingsPageAlbumArtSize"
+                        HeaderIcon="{ui:FontIcon FontFamily={StaticResource IconFontFamily},
+                                                 Glyph=&#xE744;}"
+                        IsExpanded="True">
+                        <controls:SettingsExpander.Items>
+                            <controls:SettingsCard x:Uid="SettingsPageAutoSize">
+                                <ToggleSwitch IsOn="{x:Bind AlbumArtLayoutSettings.AutoAlbumArtSize, Mode=TwoWay}" />
+                            </controls:SettingsCard>
+                            <controls:SettingsCard IsEnabled="{x:Bind AlbumArtLayoutSettings.AutoAlbumArtSize, Converter={StaticResource BoolNegationConverter}, Mode=OneWay}">
+                                <local:ExtendedSlider
+                                    Frequency="2"
+                                    Maximum="800"
+                                    Minimum="10"
+                                    ResetButtonVisibility="Collapsed"
+                                    Unit="px"
+                                    Value="{x:Bind AlbumArtLayoutSettings.AlbumArtSize, Mode=TwoWay}" />
+                            </controls:SettingsCard>
+                        </controls:SettingsExpander.Items>
+                    </controls:SettingsExpander>
+
                     <controls:SettingsCard x:Uid="SettingsPageAlbumRadius" HeaderIcon="{ui:FontIcon FontFamily={StaticResource IconFontFamily}, Glyph=&#xEA3A;}">
                         <local:ExtendedSlider
                             Default="12"
@@ -24,7 +45,7 @@
                             Maximum="100"
                             Minimum="0"
                             Unit="%"
-                            Value="{x:Bind ViewModel.AppSettings.AlbumArtLayoutSettings.CoverImageRadius, Mode=TwoWay}" />
+                            Value="{x:Bind AlbumArtLayoutSettings.CoverImageRadius, Mode=TwoWay}" />
                     </controls:SettingsCard>
 
                     <controls:SettingsCard x:Uid="SettingsPageAlbumShadowAmount" HeaderIcon="{ui:FontIcon FontFamily={StaticResource IconFontFamily}, Glyph=&#xF5EF;}">
@@ -33,13 +54,13 @@
                             Frequency="1"
                             Maximum="64"
                             Minimum="0"
-                            Value="{x:Bind ViewModel.AppSettings.AlbumArtLayoutSettings.CoverImageShadowAmount, Mode=TwoWay}" />
+                            Value="{x:Bind AlbumArtLayoutSettings.CoverImageShadowAmount, Mode=TwoWay}" />
                     </controls:SettingsCard>
 
                     <TextBlock x:Uid="SettingsPageSongInfo" Style="{StaticResource SettingsSectionHeaderTextBlockStyle}" />
 
                     <controls:SettingsCard x:Uid="SettingsPageSongInfoAlignment" HeaderIcon="{ui:FontIcon FontFamily={StaticResource IconFontFamily}, Glyph=&#xE8E3;}">
-                        <ComboBox SelectedIndex="{x:Bind ViewModel.AppSettings.AlbumArtLayoutSettings.SongInfoAlignmentType, Mode=TwoWay, Converter={StaticResource EnumToIntConverter}}">
+                        <ComboBox SelectedIndex="{x:Bind AlbumArtLayoutSettings.SongInfoAlignmentType, Mode=TwoWay, Converter={StaticResource EnumToIntConverter}}">
                             <ComboBoxItem x:Uid="SettingsPageSongInfoLeft" />
                             <ComboBoxItem x:Uid="SettingsPageSongInfoCenter" />
                             <ComboBoxItem x:Uid="SettingsPageSongInfoRight" />
@@ -50,14 +71,26 @@
                         <local:ExtendedSlider
                             Default="18"
                             Frequency="2"
-                            Maximum="48"
-                            Minimum="12"
-                            Value="{x:Bind ViewModel.AppSettings.AlbumArtLayoutSettings.SongInfoFontSize, Mode=TwoWay}" />
+                            Maximum="72"
+                            Minimum="8"
+                            Value="{x:Bind AlbumArtLayoutSettings.SongInfoFontSize, Mode=TwoWay}" />
                     </controls:SettingsCard>
 
+                    <controls:SettingsExpander
+                        x:Uid="SettingsPageShowTitle"
+                        HeaderIcon="{ui:FontIcon FontFamily={StaticResource IconFontFamily},
+                                                 Glyph=&#xEF3D;}"
+                        IsExpanded="True">
+                        <ToggleSwitch IsOn="{x:Bind AlbumArtLayoutSettings.ShowTitle, Mode=TwoWay}" />
+                        <controls:SettingsExpander.Items>
+                            <controls:SettingsCard x:Uid="SettingsPageShowArtists">
+                                <ToggleSwitch IsEnabled="{x:Bind AlbumArtLayoutSettings.ShowTitle, Mode=OneWay}" IsOn="{x:Bind AlbumArtLayoutSettings.ShowArtists, Mode=TwoWay}" />
+                            </controls:SettingsCard>
+                        </controls:SettingsExpander.Items>
+                    </controls:SettingsExpander>
+
                 </StackPanel>
             </Grid>
         </ScrollViewer>
-
     </Grid>
 </UserControl>

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Controls/AlbumArtLayoutSettingsControl.xaml.cs

@@ -1,3 +1,4 @@
+using BetterLyrics.WinUI3.Models.Settings;
 using BetterLyrics.WinUI3.ViewModels;
 using CommunityToolkit.Mvvm.DependencyInjection;
 using Microsoft.UI.Xaml;
@@ -22,11 +23,18 @@ namespace BetterLyrics.WinUI3.Controls
 {
     public sealed partial class AlbumArtLayoutSettingsControl : UserControl
     {
-        public AlbumArtLayoutSettingsControlViewModel ViewModel => (AlbumArtLayoutSettingsControlViewModel)DataContext;
+        public static readonly DependencyProperty AlbumArtLayoutSettingsProperty =
+            DependencyProperty.Register(nameof(AlbumArtLayoutSettings), typeof(AlbumArtLayoutSettings), typeof(AlbumArtLayoutSettingsControl), new PropertyMetadata(default));
+
+        public AlbumArtLayoutSettings AlbumArtLayoutSettings
+        {
+            get => (AlbumArtLayoutSettings)GetValue(AlbumArtLayoutSettingsProperty);
+            set => SetValue(AlbumArtLayoutSettingsProperty, value);
+        }
+
         public AlbumArtLayoutSettingsControl()
         {
             InitializeComponent();
-            DataContext = Ioc.Default.GetRequiredService<AlbumArtLayoutSettingsControlViewModel>();
         }
     }
 }

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Controls/AllLyricsSettingsControl.xaml

@@ -1,40 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<UserControl
-    x:Class="BetterLyrics.WinUI3.Controls.AllLyricsSettingsControl"
-    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:controls="using:CommunityToolkit.WinUI.Controls"
-    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-    xmlns:local="using:BetterLyrics.WinUI3.Controls"
-    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-    xmlns:uc="using:BetterLyrics.WinUI3.Controls"
-    mc:Ignorable="d">
-
-    <Grid>
-        <controls:SwitchPresenter Margin="0,72,0,0" Value="{Binding SelectedItem.Tag, ElementName=LyricsSettingsSegmentedControl}">
-            <controls:Case Value="Standard">
-                <uc:LyricsSettingsControl LyricsEffectSettings="{x:Bind ViewModel.AppSettings.StandardLyricsEffectSettings, Mode=OneWay}" LyricsStyleSettings="{x:Bind ViewModel.AppSettings.StandardLyricsStyleSettings, Mode=OneWay}" />
-            </controls:Case>
-            <controls:Case Value="Desktop">
-                <uc:LyricsSettingsControl LyricsEffectSettings="{x:Bind ViewModel.AppSettings.DesktopLyricsEffectSettings, Mode=OneWay}" LyricsStyleSettings="{x:Bind ViewModel.AppSettings.DesktopLyricsStyleSettings, Mode=OneWay}" />
-            </controls:Case>
-            <controls:Case Value="Dock">
-                <uc:LyricsSettingsControl LyricsEffectSettings="{x:Bind ViewModel.AppSettings.DockLyricsEffectSettings, Mode=OneWay}" LyricsStyleSettings="{x:Bind ViewModel.AppSettings.DockLyricsStyleSettings, Mode=OneWay}" />
-            </controls:Case>
-            <controls:Case Value="PictureInPicture">
-                <uc:LyricsSettingsControl LyricsEffectSettings="{x:Bind ViewModel.AppSettings.PictureInPictureLyricsEffectSettings, Mode=OneWay}" LyricsStyleSettings="{x:Bind ViewModel.AppSettings.PictureInPictureLyricsStyleSettings, Mode=OneWay}" />
-            </controls:Case>
-        </controls:SwitchPresenter>
-        <controls:Segmented
-            x:Name="LyricsSettingsSegmentedControl"
-            Margin="36,36,36,0"
-            HorizontalAlignment="Stretch"
-            VerticalAlignment="Top"
-            SelectedIndex="{x:Bind ViewModel.SelectedTabIndex, Mode=OneWay}">
-            <controls:SegmentedItem x:Uid="AllLyricsSettingsControlStandard" Tag="Standard" />
-            <controls:SegmentedItem x:Uid="AllLyricsSettingsControlDock" Tag="Dock" />
-            <controls:SegmentedItem x:Uid="AllLyricsSettingsControlDesktop" Tag="Desktop" />
-            <controls:SegmentedItem x:Uid="AllLyricsSettingsControlPictureInPicture" Tag="PictureInPicture" />
-        </controls:Segmented>
-    </Grid>
-</UserControl>

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

@@ -11,375 +11,87 @@
     mc:Ignorable="d">
 
     <Grid>
-        <controls:SwitchPresenter Margin="0,72,0,0" Value="{Binding SelectedItem.Tag, ElementName=SegmentedControl}">
+        <ScrollViewer Style="{StaticResource SettingsScrollViewerStyle}">
+            <Grid Style="{StaticResource SettingsGridStyle}">
+                <StackPanel Spacing="{StaticResource SettingsCardSpacing}">
 
-            <controls:Case Value="General">
-                <ScrollViewer Style="{StaticResource SettingsScrollViewerStyle}">
-                    <Grid Style="{StaticResource SettingsGridStyle}">
-                        <StackPanel Spacing="{StaticResource SettingsCardSpacing}">
+                    <!--  App appearance  -->
 
-                            <!--  App appearance  -->
+                    <TextBlock x:Uid="SettingsPageAppAppearance" Style="{StaticResource SettingsSectionHeaderTextBlockStyle}" />
 
-                            <TextBlock x:Uid="SettingsPageAppAppearance" Style="{StaticResource SettingsSectionHeaderTextBlockStyle}" />
-
-                            <controls:SettingsExpander
-                                x:Uid="SettingsPageLanguage"
-                                HeaderIcon="{ui:FontIcon FontFamily={StaticResource IconFontFamily},
-                                                         Glyph=&#xF2B7;}"
-                                IsExpanded="True">
-                                <ComboBox SelectedIndex="{x:Bind ViewModel.AppSettings.GeneralSettings.Language, Mode=TwoWay, Converter={StaticResource EnumToIntConverter}}">
-                                    <ComboBoxItem x:Uid="SettingsPageSystemLanguage" />
-                                    <ComboBoxItem x:Uid="SettingsPageEN" />
-                                    <ComboBoxItem x:Uid="SettingsPageSC" />
-                                    <ComboBoxItem x:Uid="SettingsPageTC" />
-                                    <ComboBoxItem x:Uid="SettingsPageJA" />
-                                    <ComboBoxItem x:Uid="SettingsPageKO" />
-                                </ComboBox>
-                                <controls:SettingsExpander.Items>
-                                    <controls:SettingsCard>
-                                        <Button x:Uid="SettingsPageRestart" Command="{x:Bind ViewModel.RestartAppCommand}" />
-                                    </controls:SettingsCard>
-                                </controls:SettingsExpander.Items>
-                            </controls:SettingsExpander>
-
-                            <!--  App behavior  -->
-
-                            <TextBlock x:Uid="SettingsPageAppBehavior" Style="{StaticResource SettingsSectionHeaderTextBlockStyle}" />
-
-                            <controls:SettingsCard x:Uid="SettingsPageAutoStart" HeaderIcon="{ui:FontIcon FontFamily={StaticResource IconFontFamily}, Glyph=&#xF71C;}">
-                                <ToggleSwitch
-                                    x:Name="AutoStartupToggleSwitch"
-                                    Loaded="AutoStartupToggleSwitch_Loaded"
-                                    Unloaded="AutoStartupToggleSwitch_Unloaded" />
+                    <controls:SettingsExpander
+                        x:Uid="SettingsPageLanguage"
+                        HeaderIcon="{ui:FontIcon FontFamily={StaticResource IconFontFamily},
+                                                 Glyph=&#xF2B7;}"
+                        IsExpanded="True">
+                        <ComboBox SelectedIndex="{x:Bind ViewModel.AppSettings.GeneralSettings.Language, Mode=TwoWay, Converter={StaticResource EnumToIntConverter}}">
+                            <ComboBoxItem x:Uid="SettingsPageSystemLanguage" />
+                            <ComboBoxItem x:Uid="SettingsPageEN" />
+                            <ComboBoxItem x:Uid="SettingsPageSC" />
+                            <ComboBoxItem x:Uid="SettingsPageTC" />
+                            <ComboBoxItem x:Uid="SettingsPageJA" />
+                            <ComboBoxItem x:Uid="SettingsPageKO" />
+                        </ComboBox>
+                        <controls:SettingsExpander.Items>
+                            <controls:SettingsCard>
+                                <Button x:Uid="SettingsPageRestart" Command="{x:Bind ViewModel.RestartAppCommand}" />
                             </controls:SettingsCard>
+                        </controls:SettingsExpander.Items>
+                    </controls:SettingsExpander>
 
-                            <controls:SettingsCard x:Uid="SettingsPageAutoStartWindow" HeaderIcon="{ui:FontIcon FontFamily={StaticResource IconFontFamily}, Glyph=&#xE736;}">
-                                <ComboBox SelectedIndex="{x:Bind ViewModel.AppSettings.GeneralSettings.AutoStartWindowType, Mode=TwoWay, Converter={StaticResource EnumToIntConverter}}">
-                                    <ComboBoxItem x:Uid="SettingsPageAutoStartInAppLyrics" />
-                                    <ComboBoxItem x:Uid="SettingsPageAutoStartDockLyrics" />
-                                    <ComboBoxItem x:Uid="SettingsPageAutoStartDesktopLyrics" />
-                                    <ComboBoxItem x:Uid="SettingsPageAutoStartPIPLyrics" />
-                                </ComboBox>
-                            </controls:SettingsCard>
+                    <!--  App behavior  -->
 
-                            <controls:SettingsExpander
-                                x:Name="LyricsWindowManagerExpander"
-                                x:Uid="SettingsPageLyricsWindowManager"
-                                HeaderIcon="{ui:FontIcon FontFamily={StaticResource IconFontFamily},
-                                                         Glyph=&#xE61F;}"
-                                IsExpanded="True" />
+                    <TextBlock x:Uid="SettingsPageAppBehavior" Style="{StaticResource SettingsSectionHeaderTextBlockStyle}" />
 
-                            <Grid
-                                Margin="0,-20,0,0"
-                                Padding="60,16"
-                                Background="{ThemeResource CardBackgroundFillColorDefaultBrush}"
-                                CornerRadius="4"
-                                Visibility="{Binding ElementName=LyricsWindowManagerExpander, Path=IsExpanded, Mode=OneWay, Converter={StaticResource BoolToVisibilityConverter}}">
-                                <StackPanel Spacing="16">
-                                    <TextBlock x:Uid="SettingsPageCurrentLyricsWindowStatus" />
-                                    <StackPanel HorizontalAlignment="Left" Spacing="4">
-                                        <Grid
-                                            Width="{x:Bind ViewModel.LiveStates.DemoLyricsWindowMonitorBounds.Width, Mode=OneWay}"
-                                            Height="{x:Bind ViewModel.LiveStates.DemoLyricsWindowMonitorBounds.Height, Mode=OneWay}"
-                                            Background="{ThemeResource CardBackgroundFillColorSecondaryBrush}">
-                                            <Grid
-                                                Width="{x:Bind ViewModel.LiveStates.DemoLyricsWindowBounds.Width, Mode=OneWay}"
-                                                Height="{x:Bind ViewModel.LiveStates.DemoLyricsWindowBounds.Height, Mode=OneWay}"
-                                                Margin="{x:Bind ViewModel.LiveStates.DemoLyricsWindowBounds, Converter={StaticResource RectToMarginConverter}, Mode=OneWay}"
-                                                HorizontalAlignment="Left"
-                                                VerticalAlignment="Top"
-                                                Background="{ThemeResource AccentFillColorDefaultBrush}"
-                                                CornerRadius="4" />
-                                            <TextBlock
-                                                HorizontalAlignment="Center"
-                                                VerticalAlignment="Center"
-                                                FontWeight="ExtraBlack"
-                                                Opacity="0.7"
-                                                Text="{x:Bind ViewModel.LiveStates.LyricsWindowMonitorName, Mode=OneWay}"
-                                                TextWrapping="Wrap" />
-                                        </Grid>
-                                        <Grid>
-                                            <Button
-                                                x:Uid="SettingsPageRecord"
-                                                HorizontalAlignment="Stretch"
-                                                Command="{x:Bind ViewModel.RecordCurrentWindowBoundsCommand}"
-                                                Style="{StaticResource AccentButtonStyle}" />
-                                        </Grid>
-                                    </StackPanel>
-                                </StackPanel>
-                            </Grid>
+                    <controls:SettingsCard x:Uid="SettingsPageAutoStart" HeaderIcon="{ui:FontIcon FontFamily={StaticResource IconFontFamily}, Glyph=&#xF71C;}">
+                        <ToggleSwitch
+                            x:Name="AutoStartupToggleSwitch"
+                            Loaded="AutoStartupToggleSwitch_Loaded"
+                            Unloaded="AutoStartupToggleSwitch_Unloaded" />
+                    </controls:SettingsCard>
 
-                            <StackPanel
-                                Margin="0,-3,0,0"
-                                Padding="60,16"
-                                Background="{ThemeResource CardBackgroundFillColorDefaultBrush}"
-                                CornerRadius="4"
-                                Spacing="16"
-                                Visibility="{Binding ElementName=LyricsWindowManagerExpander, Path=IsExpanded, Mode=OneWay, Converter={StaticResource BoolToVisibilityConverter}}">
-                                <TextBlock x:Uid="SettingsPageRecordedWindowStatus" />
-                                <GridView
-                                    Margin="-2"
-                                    CornerRadius="4"
-                                    ItemsSource="{x:Bind ViewModel.AppSettings.WindowBoundsRecords, Mode=OneWay}"
-                                    SelectionMode="None">
-                                    <GridView.ItemContainerStyle>
-                                        <Style BasedOn="{StaticResource DefaultGridViewItemStyle}" TargetType="GridViewItem">
-                                            <Setter Property="Margin" Value="5,5,5,5" />
-                                        </Style>
-                                    </GridView.ItemContainerStyle>
-                                    <GridView.ItemsPanel>
-                                        <ItemsPanelTemplate>
-                                            <ItemsWrapGrid Orientation="Horizontal" />
-                                        </ItemsPanelTemplate>
-                                    </GridView.ItemsPanel>
-                                    <GridView.ItemTemplate>
-                                        <DataTemplate>
-                                            <Grid>
-                                                <StackPanel Spacing="4">
-                                                    <Grid
-                                                        Width="{Binding DemoMonitorBounds.Width}"
-                                                        Height="{Binding DemoMonitorBounds.Height}"
-                                                        Background="{ThemeResource CardBackgroundFillColorSecondaryBrush}">
-                                                        <Grid
-                                                            Width="{Binding DemoWindowBounds.Width}"
-                                                            Height="{Binding DemoWindowBounds.Height}"
-                                                            Margin="{Binding DemoWindowBounds, Converter={StaticResource RectToMarginConverter}}"
-                                                            HorizontalAlignment="Left"
-                                                            VerticalAlignment="Top"
-                                                            Background="{ThemeResource AccentFillColorDefaultBrush}"
-                                                            CornerRadius="4" />
-                                                        <TextBlock
-                                                            HorizontalAlignment="Center"
-                                                            VerticalAlignment="Center"
-                                                            FontWeight="ExtraBlack"
-                                                            Opacity="0.7"
-                                                            Text="{Binding MonitorDeviceName}"
-                                                            TextWrapping="Wrap" />
-                                                    </Grid>
-                                                    <Grid ColumnSpacing="4">
-                                                        <Grid.ColumnDefinitions>
-                                                            <ColumnDefinition Width="*" />
-                                                            <ColumnDefinition Width="*" />
-                                                        </Grid.ColumnDefinitions>
-                                                        <Button
-                                                            x:Uid="SettingsPageDelete"
-                                                            Grid.Column="0"
-                                                            HorizontalAlignment="Stretch"
-                                                            Click="DeleteWindowBoundsRecordButton_Click" />
-                                                        <Button
-                                                            x:Uid="SettingsPageApply"
-                                                            Grid.Column="1"
-                                                            HorizontalAlignment="Stretch"
-                                                            Click="ApplyWindowBoundsRecordButton_Click"
-                                                            Style="{StaticResource AccentButtonStyle}" />
-                                                    </Grid>
-                                                </StackPanel>
-                                            </Grid>
-                                        </DataTemplate>
-                                    </GridView.ItemTemplate>
-                                </GridView>
-                            </StackPanel>
+                    <controls:SettingsCard x:Uid="SettingsPageExitOnLyricsWindowClosed" HeaderIcon="{ui:FontIcon FontFamily={StaticResource IconFontFamily}, Glyph=&#xE7E8;}">
+                        <ToggleSwitch IsOn="{x:Bind ViewModel.AppSettings.GeneralSettings.ExitOnLyricsWindowClosed, Mode=TwoWay}" />
+                    </controls:SettingsCard>
 
-                            <controls:SettingsCard x:Uid="SettingsPageIgnoreFullscreenWindow" HeaderIcon="{ui:FontIcon FontFamily={StaticResource IconFontFamily}, Glyph=&#xE967;}">
-                                <ToggleSwitch IsOn="{x:Bind ViewModel.AppSettings.GeneralSettings.IgnoreFullscreenWindow, Mode=TwoWay}" />
-                            </controls:SettingsCard>
+                    <controls:SettingsCard x:Uid="SettingsPageListenNewSession" HeaderIcon="{ui:FontIcon FontFamily={StaticResource IconFontFamily}, Glyph=&#xF270;}">
+                        <ToggleSwitch IsOn="{x:Bind ViewModel.AppSettings.GeneralSettings.ListenOnNewPlaybackSource, Mode=TwoWay}" />
+                    </controls:SettingsCard>
 
-                            <controls:SettingsCard x:Uid="SettingsPageHideWindow" HeaderIcon="{ui:FontIcon FontFamily={StaticResource IconFontFamily}, Glyph=&#xED1A;}">
-                                <ToggleSwitch IsOn="{x:Bind ViewModel.AppSettings.GeneralSettings.HideWindowWhenNotPlaying, Mode=TwoWay}" />
-                            </controls:SettingsCard>
+                    <controls:SettingsCard x:Uid="SettingsPageShowHideHotKey" HeaderIcon="{ui:FontIcon FontFamily={StaticResource IconFontFamily}, Glyph=&#xEDA7;}">
+                        <local:ShortcutTextBox Shortcut="{x:Bind ViewModel.AppSettings.GeneralSettings.ShowOrHideLyricsWindowShortcut, Mode=TwoWay}" />
+                    </controls:SettingsCard>
 
-                            <controls:SettingsCard x:Uid="SettingsPageShowHideHotKey" HeaderIcon="{ui:FontIcon FontFamily={StaticResource IconFontFamily}, Glyph=&#xEDA7;}">
-                                <local:ShortcutTextBox Shortcut="{x:Bind ViewModel.AppSettings.GeneralSettings.ShowOrHideLyricsWindowShortcut, Mode=TwoWay}" />
-                            </controls:SettingsCard>
+                    <controls:SettingsCard x:Uid="SettingsPageBorderlessHotKey" HeaderIcon="{ui:FontIcon FontFamily={StaticResource IconFontFamily}, Glyph=&#xEDA7;}">
+                        <local:ShortcutTextBox Shortcut="{x:Bind ViewModel.AppSettings.GeneralSettings.BorderlessShortcut, Mode=TwoWay}" />
+                    </controls:SettingsCard>
 
-                            <controls:SettingsCard x:Uid="SettingsPageGlobalDrag" HeaderIcon="{ui:FontIcon FontFamily={StaticResource IconFontFamily}, Glyph=&#xE7C2;}">
-                                <ToggleSwitch IsOn="{x:Bind ViewModel.AppSettings.GeneralSettings.IsDragEverywhereEnabled, Mode=TwoWay}" />
-                            </controls:SettingsCard>
+                    <controls:SettingsCard x:Uid="SettingsPageClickThroughHotKey" HeaderIcon="{ui:FontIcon FontFamily={StaticResource IconFontFamily}, Glyph=&#xEDA7;}">
+                        <local:ShortcutTextBox Shortcut="{x:Bind ViewModel.AppSettings.GeneralSettings.ClickThroughShortcut, Mode=TwoWay}" />
+                    </controls:SettingsCard>
 
-                            <controls:SettingsCard x:Uid="SettingsPageExitOnLyricsWindowClosed" HeaderIcon="{ui:FontIcon FontFamily={StaticResource IconFontFamily}, Glyph=&#xE7E8;}">
-                                <ToggleSwitch IsOn="{x:Bind ViewModel.AppSettings.GeneralSettings.ExitOnLyricsWindowClosed, Mode=TwoWay}" />
-                            </controls:SettingsCard>
+                    <controls:SettingsCard x:Uid="SettingsPageLyricsWindowSwitchHotKey" HeaderIcon="{ui:FontIcon FontFamily={StaticResource IconFontFamily}, Glyph=&#xEDA7;}">
+                        <local:ShortcutTextBox Shortcut="{x:Bind ViewModel.AppSettings.GeneralSettings.LyricsWindowSwitchShortcut, Mode=TwoWay}" />
+                    </controls:SettingsCard>
 
-                            <!--  Playback shortcut  -->
+                    <!--  Playback shortcut  -->
 
-                            <TextBlock x:Uid="SettingsPagePlaybackShortcut" Style="{StaticResource SettingsSectionHeaderTextBlockStyle}" />
+                    <TextBlock x:Uid="SettingsPagePlaybackShortcut" Style="{StaticResource SettingsSectionHeaderTextBlockStyle}" />
 
-                            <controls:SettingsCard x:Uid="SettingsPagePlayOrPauseSongHotKey" HeaderIcon="{ui:FontIcon FontFamily={StaticResource IconFontFamily}, Glyph=&#xEDA7;}">
-                                <local:ShortcutTextBox Shortcut="{x:Bind ViewModel.AppSettings.GeneralSettings.PlayOrPauseShortcut, Mode=TwoWay}" />
-                            </controls:SettingsCard>
+                    <controls:SettingsCard x:Uid="SettingsPagePlayOrPauseSongHotKey" HeaderIcon="{ui:FontIcon FontFamily={StaticResource IconFontFamily}, Glyph=&#xEDA7;}">
+                        <local:ShortcutTextBox Shortcut="{x:Bind ViewModel.AppSettings.GeneralSettings.PlayOrPauseShortcut, Mode=TwoWay}" />
+                    </controls:SettingsCard>
 
-                            <controls:SettingsCard x:Uid="SettingsPageNextSongHotKey" HeaderIcon="{ui:FontIcon FontFamily={StaticResource IconFontFamily}, Glyph=&#xEDA7;}">
-                                <local:ShortcutTextBox Shortcut="{x:Bind ViewModel.AppSettings.GeneralSettings.NextSongShortcut, Mode=TwoWay}" />
-                            </controls:SettingsCard>
+                    <controls:SettingsCard x:Uid="SettingsPageNextSongHotKey" HeaderIcon="{ui:FontIcon FontFamily={StaticResource IconFontFamily}, Glyph=&#xEDA7;}">
+                        <local:ShortcutTextBox Shortcut="{x:Bind ViewModel.AppSettings.GeneralSettings.NextSongShortcut, Mode=TwoWay}" />
+                    </controls:SettingsCard>
 
-                            <controls:SettingsCard x:Uid="SettingsPagePreviousSongHotKey" HeaderIcon="{ui:FontIcon FontFamily={StaticResource IconFontFamily}, Glyph=&#xEDA7;}">
-                                <local:ShortcutTextBox Shortcut="{x:Bind ViewModel.AppSettings.GeneralSettings.PreviousSongShortcut, Mode=TwoWay}" />
-                            </controls:SettingsCard>
-
-                        </StackPanel>
-                    </Grid>
-                </ScrollViewer>
-
-            </controls:Case>
-
-            <controls:Case Value="Standard">
-                <ScrollViewer Style="{StaticResource SettingsScrollViewerStyle}">
-                    <Grid Style="{StaticResource SettingsGridStyle}">
-                        <StackPanel Spacing="{StaticResource SettingsCardSpacing}">
-
-                            <!--  Standard mode  -->
-
-                            <TextBlock Style="{StaticResource SettingsSectionHeaderTextBlockStyle}" />
-
-                            <controls:SettingsCard x:Uid="SettingsPageDisplayTypeSwitcher" HeaderIcon="{ui:FontIcon FontFamily={StaticResource IconFontFamily}, Glyph=&#xF246;}">
-                                <ComboBox SelectedIndex="{x:Bind ViewModel.AppSettings.StandardModeSettings.LyricsDisplayType, Mode=TwoWay, Converter={StaticResource EnumToIntConverter}}">
-                                    <ComboBoxItem x:Uid="MainPageAlbumArtOnly" />
-                                    <ComboBoxItem x:Uid="MainPageLyriscOnly" />
-                                    <ComboBoxItem x:Uid="MainPageSplitView" />
-                                </ComboBox>
-                            </controls:SettingsCard>
-
-                            <controls:SettingsCard x:Uid="SettingsPageAOT" HeaderIcon="{ui:FontIcon FontFamily={StaticResource IconFontFamily}, Glyph=&#xE718;}">
-                                <ToggleSwitch IsOn="{x:Bind ViewModel.AppSettings.StandardModeSettings.IsAlwaysOnTop, Mode=TwoWay}" />
-                            </controls:SettingsCard>
-
-                        </StackPanel>
-                    </Grid>
-                </ScrollViewer>
-            </controls:Case>
-
-            <controls:Case Value="Desktop">
-                <ScrollViewer Style="{StaticResource SettingsScrollViewerStyle}">
-                    <Grid Style="{StaticResource SettingsGridStyle}">
-                        <StackPanel Spacing="{StaticResource SettingsCardSpacing}">
-
-                            <!--  Desktop mode  -->
-
-                            <TextBlock Style="{StaticResource SettingsSectionHeaderTextBlockStyle}" />
-
-                            <controls:SettingsCard x:Uid="SettingsPageDisplayTypeSwitcher" HeaderIcon="{ui:FontIcon FontFamily={StaticResource IconFontFamily}, Glyph=&#xF246;}">
-                                <ComboBox SelectedIndex="{x:Bind ViewModel.AppSettings.DesktopModeSettings.LyricsDisplayType, Mode=TwoWay, Converter={StaticResource EnumToIntConverter}}">
-                                    <ComboBoxItem x:Uid="MainPageAlbumArtOnly" />
-                                    <ComboBoxItem x:Uid="MainPageLyriscOnly" />
-                                    <ComboBoxItem x:Uid="MainPageSplitView" />
-                                </ComboBox>
-                            </controls:SettingsCard>
-
-                            <controls:SettingsCard x:Uid="SettingsPageAOT" HeaderIcon="{ui:FontIcon FontFamily={StaticResource IconFontFamily}, Glyph=&#xE718;}">
-                                <ToggleSwitch IsOn="{x:Bind ViewModel.AppSettings.DesktopModeSettings.IsAlwaysOnTop, Mode=TwoWay}" />
-                            </controls:SettingsCard>
-
-                            <controls:SettingsCard x:Uid="SettingsPageToggleHotKey" HeaderIcon="{ui:FontIcon FontFamily={StaticResource IconFontFamily}, Glyph=&#xEDA7;}">
-                                <local:ShortcutTextBox Shortcut="{x:Bind ViewModel.AppSettings.DesktopModeSettings.ToggleShortcut, Mode=TwoWay}" />
-                            </controls:SettingsCard>
-
-                            <controls:SettingsCard x:Uid="SettingsPageAutoLock" HeaderIcon="{ui:FontIcon FontFamily={StaticResource IconFontFamily}, Glyph=&#xE755;}">
-                                <ToggleSwitch IsOn="{x:Bind ViewModel.AppSettings.DesktopModeSettings.AutoLockOnDesktopMode, Mode=TwoWay}" />
-                            </controls:SettingsCard>
-
-                            <controls:SettingsCard x:Uid="SettingsPageLockHotKey" HeaderIcon="{ui:FontIcon FontFamily={StaticResource IconFontFamily}, Glyph=&#xEDA7;}">
-                                <local:ShortcutTextBox Shortcut="{x:Bind ViewModel.AppSettings.DesktopModeSettings.LockShortcut, Mode=TwoWay}" />
-                            </controls:SettingsCard>
-
-                        </StackPanel>
-                    </Grid>
-                </ScrollViewer>
-            </controls:Case>
-
-            <controls:Case Value="Dock">
-                <ScrollViewer Style="{StaticResource SettingsScrollViewerStyle}">
-                    <Grid Style="{StaticResource SettingsGridStyle}">
-                        <StackPanel Spacing="{StaticResource SettingsCardSpacing}">
-
-                            <!--  Dock mode  -->
-
-                            <TextBlock Style="{StaticResource SettingsSectionHeaderTextBlockStyle}" />
-
-                            <controls:SettingsCard x:Uid="SettingsPageDisplayTypeSwitcher" HeaderIcon="{ui:FontIcon FontFamily={StaticResource IconFontFamily}, Glyph=&#xF246;}">
-                                <ComboBox SelectedIndex="{x:Bind ViewModel.AppSettings.DockModeSettings.LyricsDisplayType, Mode=TwoWay, Converter={StaticResource EnumToIntConverter}}">
-                                    <ComboBoxItem x:Uid="MainPageAlbumArtOnly" />
-                                    <ComboBoxItem x:Uid="MainPageLyriscOnly" />
-                                    <ComboBoxItem x:Uid="MainPageSplitView" />
-                                </ComboBox>
-                            </controls:SettingsCard>
-
-                            <controls:SettingsCard x:Uid="SettingsPageToggleHotKey" HeaderIcon="{ui:FontIcon FontFamily={StaticResource IconFontFamily}, Glyph=&#xEDA7;}">
-                                <local:ShortcutTextBox Shortcut="{x:Bind ViewModel.AppSettings.DockModeSettings.ToggleShortcut, Mode=TwoWay}" />
-                            </controls:SettingsCard>
-
-                            <controls:SettingsCard x:Uid="SettingsPageDockMonitor" HeaderIcon="{ui:FontIcon FontFamily={StaticResource IconFontFamily}, Glyph=&#xE7F4;}">
-                                <StackPanel Orientation="Horizontal" Spacing="6">
-                                    <ComboBox ItemsSource="{x:Bind ViewModel.MonitorDeviceNames, Mode=OneWay}" SelectedItem="{x:Bind ViewModel.AppSettings.DockModeSettings.DockMonitorDeviceName, Mode=TwoWay}" />
-                                    <Button
-                                        Command="{x:Bind ViewModel.RefreshMonitorDeviceNamesCommand}"
-                                        Content="{ui:FontIcon FontFamily={StaticResource IconFontFamily},
-                                                              FontSize=12,
-                                                              Glyph=&#xE72C;}"
-                                        Style="{StaticResource GhostButtonStyle}" />
-                                </StackPanel>
-                            </controls:SettingsCard>
-
-                            <controls:SettingsCard x:Uid="SettingsPageDockWindowHeight" HeaderIcon="{ui:FontIcon FontFamily={StaticResource IconFontFamily}, Glyph=&#xED5E;}">
-                                <local:ExtendedSlider
-                                    Default="64"
-                                    Frequency="1"
-                                    Maximum="200"
-                                    Minimum="64"
-                                    Unit="px"
-                                    Value="{x:Bind ViewModel.AppSettings.DockModeSettings.DockWindowHeight, Mode=TwoWay}" />
-                            </controls:SettingsCard>
-
-                            <controls:SettingsCard x:Uid="SettingsPageDockPlacement" HeaderIcon="{ui:FontIcon FontFamily={StaticResource IconFontFamily}, Glyph=&#xE8E3;}">
-                                <ComboBox SelectedIndex="{x:Bind ViewModel.AppSettings.DockModeSettings.DockPlacement, Mode=TwoWay, Converter={StaticResource EnumToIntConverter}}">
-                                    <ComboBoxItem x:Uid="SettingsPageDockPlacementTop" />
-                                    <ComboBoxItem x:Uid="SettingsPageDockPlacementBottom" />
-                                </ComboBox>
-                            </controls:SettingsCard>
-
-                        </StackPanel>
-                    </Grid>
-                </ScrollViewer>
-            </controls:Case>
-
-            <controls:Case Value="PictureInPicture">
-                <ScrollViewer Style="{StaticResource SettingsScrollViewerStyle}">
-                    <Grid Style="{StaticResource SettingsGridStyle}">
-                        <StackPanel Spacing="{StaticResource SettingsCardSpacing}">
-
-                            <!--  Picture in picture mode  -->
-
-                            <TextBlock Style="{StaticResource SettingsSectionHeaderTextBlockStyle}" />
-
-                            <controls:SettingsCard x:Uid="SettingsPageDisplayTypeSwitcher" HeaderIcon="{ui:FontIcon FontFamily={StaticResource IconFontFamily}, Glyph=&#xF246;}">
-                                <ComboBox SelectedIndex="{x:Bind ViewModel.AppSettings.PictureInPictureModeSettings.LyricsDisplayType, Mode=TwoWay, Converter={StaticResource EnumToIntConverter}}">
-                                    <ComboBoxItem x:Uid="MainPageAlbumArtOnly" />
-                                    <ComboBoxItem x:Uid="MainPageLyriscOnly" />
-                                    <ComboBoxItem x:Uid="MainPageSplitView" />
-                                </ComboBox>
-                            </controls:SettingsCard>
-
-                            <controls:SettingsCard x:Uid="SettingsPageToggleHotKey" HeaderIcon="{ui:FontIcon FontFamily={StaticResource IconFontFamily}, Glyph=&#xEDA7;}">
-                                <local:ShortcutTextBox Shortcut="{x:Bind ViewModel.AppSettings.PictureInPictureModeSettings.ToggleShortcut, Mode=TwoWay}" />
-                            </controls:SettingsCard>
-
-                        </StackPanel>
-                    </Grid>
-                </ScrollViewer>
-            </controls:Case>
-
-        </controls:SwitchPresenter>
-        <controls:Segmented
-            x:Name="SegmentedControl"
-            Margin="36,36,36,0"
-            HorizontalAlignment="Stretch"
-            VerticalAlignment="Top"
-            SelectedIndex="0">
-            <controls:SegmentedItem x:Uid="AppSettingsControlGeneral" Tag="General" />
-            <controls:SegmentedItem x:Uid="AllLyricsSettingsControlStandard" Tag="Standard" />
-            <controls:SegmentedItem x:Uid="AllLyricsSettingsControlDock" Tag="Dock" />
-            <controls:SegmentedItem x:Uid="AllLyricsSettingsControlDesktop" Tag="Desktop" />
-            <controls:SegmentedItem x:Uid="AllLyricsSettingsControlPictureInPicture" Tag="PictureInPicture" />
-        </controls:Segmented>
+                    <controls:SettingsCard x:Uid="SettingsPagePreviousSongHotKey" HeaderIcon="{ui:FontIcon FontFamily={StaticResource IconFontFamily}, Glyph=&#xEDA7;}">
+                        <local:ShortcutTextBox Shortcut="{x:Bind ViewModel.AppSettings.GeneralSettings.PreviousSongShortcut, Mode=TwoWay}" />
+                    </controls:SettingsCard>
 
+                </StackPanel>
+            </Grid>
+        </ScrollViewer>
     </Grid>
 </UserControl>

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

@@ -49,33 +49,5 @@ namespace BetterLyrics.WinUI3.Controls
         {
             AutoStartupToggleSwitch.Toggled -= AutoStartupToggleSwitch_Toggled;
         }
-
-        private void DeleteWindowBoundsRecordButton_Click(object sender, RoutedEventArgs e)
-        {
-            if (sender is Button button)
-            {
-                var data = button.DataContext as WindowBoundsRecord;
-                if (data != null)
-                {
-                    ViewModel.AppSettings.WindowBoundsRecords.Remove(data);
-                }
-            }
-        }
-
-        private void ApplyWindowBoundsRecordButton_Click(object sender, RoutedEventArgs e)
-        {
-            if (sender is Button button)
-            {
-                var data = button.DataContext as WindowBoundsRecord;
-                if (data != null)
-                {
-                    var lyricsWindow = WindowHelper.GetWindowByWindowType<LyricsWindow>();
-                    if (lyricsWindow != null)
-                    {
-                        lyricsWindow.AppWindow.MoveAndResize(data.WindowBounds.ToRectInt32());
-                    }
-                }
-            }
-        }
     }
 }

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Controls/DemoWindowGrid.xaml

@@ -0,0 +1,104 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<UserControl
+    x:Class="BetterLyrics.WinUI3.Controls.DemoWindowGrid"
+    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"
+    mc:Ignorable="d">
+
+    <Grid
+        Width="{x:Bind LyricsWindowStatus.DemoMonitorBounds.Width, Mode=OneWay}"
+        Height="{x:Bind LyricsWindowStatus.DemoMonitorBounds.Height, Mode=OneWay}"
+        Background="{ThemeResource AcrylicBackgroundFillColorBaseBrush}"
+        CornerRadius="4">
+        <Grid
+            Width="{x:Bind LyricsWindowStatus.DemoWindowBounds.Width, Mode=OneWay}"
+            Height="{x:Bind LyricsWindowStatus.DemoWindowBounds.Height, Mode=OneWay}"
+            Margin="{x:Bind LyricsWindowStatus.DemoWindowBounds, Converter={StaticResource RectToMarginConverter}, Mode=OneWay}"
+            HorizontalAlignment="Left"
+            VerticalAlignment="Top"
+            Background="{ThemeResource AccentAcrylicBackgroundFillColorDefaultBrush}"
+            BorderBrush="{ThemeResource AccentFillColorDefaultBrush}"
+            CornerRadius="4">
+            <interactivity:Interaction.Behaviors>
+                <interactivity:DataTriggerBehavior
+                    Binding="{x:Bind LyricsWindowStatus.IsBorderless, Mode=OneWay}"
+                    ComparisonCondition="Equal"
+                    Value="True">
+                    <interactivity:ChangePropertyAction PropertyName="BorderThickness" Value="0" />
+                </interactivity:DataTriggerBehavior>
+                <interactivity:DataTriggerBehavior
+                    Binding="{x:Bind LyricsWindowStatus.IsBorderless, Mode=OneWay}"
+                    ComparisonCondition="Equal"
+                    Value="False">
+                    <interactivity:ChangePropertyAction PropertyName="BorderThickness" Value="1" />
+                </interactivity:DataTriggerBehavior>
+            </interactivity:Interaction.Behaviors>
+        </Grid>
+        <!--  Is default  -->
+        <Grid
+            Margin="4"
+            Padding="6,3"
+            HorizontalAlignment="Left"
+            VerticalAlignment="Top"
+            Background="{ThemeResource AcrylicBackgroundFillColorBaseBrush}"
+            CornerRadius="4"
+            Opacity="0.7"
+            Visibility="{x:Bind LyricsWindowStatus.IsDefault, Converter={StaticResource BoolToVisibilityConverter}, Mode=OneWay}">
+            <TextBlock
+                x:Uid="DemoWindowControlDefault"
+                FontSize="12"
+                TextWrapping="Wrap" />
+        </Grid>
+        <!--  Is always on top  -->
+        <Grid
+            Margin="4"
+            Padding="6,3"
+            HorizontalAlignment="Right"
+            VerticalAlignment="Top"
+            Background="{ThemeResource AcrylicBackgroundFillColorBaseBrush}"
+            CornerRadius="4"
+            Opacity="0.7"
+            Visibility="{x:Bind LyricsWindowStatus.IsAlwaysOnTop, Converter={StaticResource BoolToVisibilityConverter}, Mode=OneWay}">
+            <FontIcon
+                FontFamily="{StaticResource IconFontFamily}"
+                FontSize="12"
+                Glyph="&#xE718;" />
+            <FontIcon
+                FontFamily="{StaticResource IconFontFamily}"
+                FontSize="12"
+                Glyph="&#xE841;"
+                Visibility="{x:Bind LyricsWindowStatus.IsAlwaysOnTopPolling, Converter={StaticResource BoolToVisibilityConverter}, Mode=OneWay}" />
+        </Grid>
+        <!--  Moniter name  -->
+        <Grid
+            Margin="4"
+            Padding="6,3"
+            HorizontalAlignment="Left"
+            VerticalAlignment="Bottom"
+            Background="{ThemeResource AcrylicBackgroundFillColorBaseBrush}"
+            CornerRadius="4"
+            Opacity="0.7">
+            <TextBlock
+                FontSize="12"
+                Text="{x:Bind LyricsWindowStatus.MonitorDeviceName, Mode=OneWay}"
+                TextWrapping="Wrap" />
+        </Grid>
+        <!--  Config name  -->
+        <Grid
+            Padding="6,3"
+            HorizontalAlignment="Center"
+            VerticalAlignment="Center"
+            CornerRadius="4"
+            Opacity="0.7">
+            <TextBlock
+                FontWeight="ExtraBlack"
+                Text="{x:Bind LyricsWindowStatus.Name, Mode=OneWay}"
+                TextWrapping="Wrap" />
+        </Grid>
+    </Grid>
+
+</UserControl>

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Controls/DemoWindowGrid.xaml.cs

@@ -0,0 +1,37 @@
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Runtime.InteropServices.WindowsRuntime;
+using Windows.Foundation;
+using Windows.Foundation.Collections;
+using Microsoft.UI.Xaml;
+using Microsoft.UI.Xaml.Controls;
+using Microsoft.UI.Xaml.Controls.Primitives;
+using Microsoft.UI.Xaml.Data;
+using Microsoft.UI.Xaml.Input;
+using Microsoft.UI.Xaml.Media;
+using Microsoft.UI.Xaml.Navigation;
+using BetterLyrics.WinUI3.Models;
+
+// 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 DemoWindowGrid : UserControl
+{
+    public DemoWindowGrid()
+    {
+        InitializeComponent();
+    }
+
+    public static readonly DependencyProperty LyricsWindowStatusProperty =
+        DependencyProperty.Register(nameof(LyricsWindowStatus), typeof(LyricsWindowStatus), typeof(DemoWindowGrid), new PropertyMetadata(default));
+
+    public LyricsWindowStatus LyricsWindowStatus
+    {
+        get => (LyricsWindowStatus)GetValue(LyricsWindowStatusProperty);
+        set => SetValue(LyricsWindowStatusProperty, value);
+    }
+}

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Controls/ExtendedSlider.xaml

@@ -24,7 +24,7 @@
             SnapsTo="Ticks"
             StepFrequency="{x:Bind Frequency, Mode=OneWay}"
             TickFrequency="{x:Bind Frequency, Mode=OneWay}"
-            TickPlacement="Outside"
+            TickPlacement="None"
             Value="{x:Bind Value, Mode=TwoWay}" />
         <Button
             Margin="3,0,0,0"

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

@@ -18,60 +18,112 @@
                     <TextBlock Style="{StaticResource SettingsSectionHeaderTextBlockStyle}" />
 
                     <controls:SettingsCard x:Uid="SettingsPageTheme" HeaderIcon="{ui:FontIcon FontFamily={StaticResource IconFontFamily}, Glyph=&#xE790;}">
-                        <ComboBox x:Name="ThemeComboBox" SelectedIndex="{x:Bind ViewModel.AppSettings.LyricsBackgroundSettings.LyricsBackgroundTheme, Mode=TwoWay, Converter={StaticResource EnumToIntConverter}}">
+                        <ComboBox x:Name="ThemeComboBox" SelectedIndex="{x:Bind LyricsBackgroundSettings.LyricsBackgroundTheme, Mode=TwoWay, Converter={StaticResource EnumToIntConverter}}">
                             <ComboBoxItem x:Uid="SettingsPageFollowSystem" />
                             <ComboBoxItem x:Uid="SettingsPageLight" />
                             <ComboBoxItem x:Uid="SettingsPageDark" />
                         </ComboBox>
                     </controls:SettingsCard>
 
-                    <controls:SettingsCard x:Uid="SettingsPageLyricsPureColorBgOpacity" HeaderIcon="{ui:FontIcon FontFamily={StaticResource IconFontFamily}, Glyph=&#xEB42;}">
-                        <uc:ExtendedSlider
-                            Default="100"
-                            Frequency="1"
-                            Maximum="100"
-                            Minimum="0"
-                            Unit="%"
-                            Value="{x:Bind ViewModel.AppSettings.LyricsBackgroundSettings.PureColorOverlayOpacity, Mode=TwoWay}" />
-                    </controls:SettingsCard>
+                    <controls:SettingsExpander
+                        x:Uid="SettingsPagePureLayer"
+                        HeaderIcon="{ui:FontIcon FontFamily={StaticResource IconFontFamily},
+                                                 Glyph=&#xEB42;}"
+                        IsExpanded="{x:Bind LyricsBackgroundSettings.IsPureColorOverlayEnabled, Mode=OneWay}">
+                        <ToggleSwitch IsOn="{x:Bind LyricsBackgroundSettings.IsPureColorOverlayEnabled, Mode=TwoWay}" />
+                        <controls:SettingsExpander.Items>
 
-                    <controls:SettingsCard x:Uid="SettingsPageLyricsBackgroundOpacity" HeaderIcon="{ui:FontIcon FontFamily={StaticResource IconFontFamily}, Glyph=&#xEB42;}">
-                        <uc:ExtendedSlider
-                            Default="100"
-                            Frequency="1"
-                            Maximum="100"
-                            Minimum="0"
-                            Unit="%"
-                            Value="{x:Bind ViewModel.AppSettings.LyricsBackgroundSettings.CoverOverlayOpacity, Mode=TwoWay}" />
-                    </controls:SettingsCard>
+                            <controls:SettingsCard x:Uid="SettingsPageOpacity" IsEnabled="{x:Bind LyricsBackgroundSettings.IsPureColorOverlayEnabled, Mode=OneWay}">
+                                <uc:ExtendedSlider
+                                    Default="100"
+                                    Frequency="1"
+                                    Maximum="100"
+                                    Minimum="0"
+                                    Unit="%"
+                                    Value="{x:Bind LyricsBackgroundSettings.PureColorOverlayOpacity, Mode=TwoWay}" />
+                            </controls:SettingsCard>
 
-                    <controls:SettingsCard x:Uid="SettingsPageLyricsBackgroundSpeed" HeaderIcon="{ui:FontIcon FontFamily={StaticResource IconFontFamily}, Glyph=&#xEC49;}">
-                        <uc:ExtendedSlider
-                            Default="50"
-                            Frequency="1"
-                            Maximum="100"
-                            Minimum="0"
-                            Unit="%"
-                            Value="{x:Bind ViewModel.AppSettings.LyricsBackgroundSettings.CoverOverlaySpeed, Mode=TwoWay}" />
-                    </controls:SettingsCard>
+                        </controls:SettingsExpander.Items>
+                    </controls:SettingsExpander>
 
-                    <controls:SettingsCard x:Uid="SettingsPageLyricsBackgroundBlurAmount" HeaderIcon="{ui:FontIcon FontFamily={StaticResource IconFontFamily}, Glyph=&#xE727;}">
-                        <uc:ExtendedSlider
-                            Default="100"
-                            Frequency="1"
-                            Maximum="100"
-                            Minimum="0"
-                            Value="{x:Bind ViewModel.AppSettings.LyricsBackgroundSettings.CoverOverlayBlurAmount, Mode=TwoWay}" />
-                    </controls:SettingsCard>
+                    <controls:SettingsExpander
+                        x:Uid="SettingsPageAlbumArtLayer"
+                        HeaderIcon="{ui:FontIcon FontFamily={StaticResource IconFontFamily},
+                                                 Glyph=&#xE93C;}"
+                        IsExpanded="{x:Bind LyricsBackgroundSettings.IsCoverOverlayEnabled, Mode=OneWay}">
+                        <ToggleSwitch IsOn="{x:Bind LyricsBackgroundSettings.IsCoverOverlayEnabled, Mode=TwoWay}" />
+                        <controls:SettingsExpander.Items>
+
+                            <controls:SettingsCard x:Uid="SettingsPageOpacity" IsEnabled="{x:Bind LyricsBackgroundSettings.IsCoverOverlayEnabled, Mode=OneWay}">
+                                <uc:ExtendedSlider
+                                    Default="100"
+                                    Frequency="1"
+                                    Maximum="100"
+                                    Minimum="0"
+                                    Unit="%"
+                                    Value="{x:Bind LyricsBackgroundSettings.CoverOverlayOpacity, Mode=TwoWay}" />
+                            </controls:SettingsCard>
+
+                            <controls:SettingsCard x:Uid="SettingsPageSpeed" IsEnabled="{x:Bind LyricsBackgroundSettings.IsCoverOverlayEnabled, Mode=OneWay}">
+                                <uc:ExtendedSlider
+                                    Default="50"
+                                    Frequency="1"
+                                    Maximum="100"
+                                    Minimum="0"
+                                    Unit="%"
+                                    Value="{x:Bind LyricsBackgroundSettings.CoverOverlaySpeed, Mode=TwoWay}" />
+                            </controls:SettingsCard>
+
+                            <controls:SettingsCard x:Uid="SettingsPageBlurAmount" IsEnabled="{x:Bind LyricsBackgroundSettings.IsCoverOverlayEnabled, Mode=OneWay}">
+                                <uc:ExtendedSlider
+                                    Default="100"
+                                    Frequency="1"
+                                    Maximum="100"
+                                    Minimum="0"
+                                    Value="{x:Bind LyricsBackgroundSettings.CoverOverlayBlurAmount, Mode=TwoWay}" />
+                            </controls:SettingsCard>
+
+                            <controls:SettingsCard x:Uid="SettingsPageBackgroundAcrylicEffectAmount" IsEnabled="{x:Bind LyricsBackgroundSettings.IsCoverOverlayEnabled, Mode=OneWay}">
+                                <uc:ExtendedSlider
+                                    Default="0"
+                                    Frequency="1"
+                                    Maximum="10"
+                                    Minimum="0"
+                                    Value="{x:Bind LyricsBackgroundSettings.CoverAcrylicEffectAmount, Mode=TwoWay}" />
+                            </controls:SettingsCard>
+
+                        </controls:SettingsExpander.Items>
+                    </controls:SettingsExpander>
+
+                    <controls:SettingsExpander
+                        x:Uid="SettingsPageFluidLayer"
+                        HeaderIcon="{ui:FontIcon FontFamily={StaticResource IconFontFamily},
+                                                 Glyph=&#xEDA8;}"
+                        IsExpanded="{x:Bind LyricsBackgroundSettings.IsFluidOverlayEnabled, Mode=OneWay}">
+                        <ToggleSwitch IsOn="{x:Bind LyricsBackgroundSettings.IsFluidOverlayEnabled, Mode=TwoWay}" />
+                        <controls:SettingsExpander.Items>
+
+                            <controls:SettingsCard x:Uid="SettingsPageOpacity" IsEnabled="{x:Bind LyricsBackgroundSettings.IsFluidOverlayEnabled, Mode=OneWay}">
+                                <uc:ExtendedSlider
+                                    Default="100"
+                                    Frequency="1"
+                                    Maximum="100"
+                                    Minimum="0"
+                                    Unit="%"
+                                    Value="{x:Bind LyricsBackgroundSettings.FluidOverlayOpacity, Mode=TwoWay}" />
+                            </controls:SettingsCard>
+
+                        </controls:SettingsExpander.Items>
+                    </controls:SettingsExpander>
+
+                    <controls:SettingsExpander
+                        x:Uid="SettingsPageSpectrumLayer"
+                        HeaderIcon="{ui:FontIcon FontFamily={StaticResource IconFontFamily},
+                                                 Glyph=&#xF61F;}"
+                        IsExpanded="{x:Bind LyricsBackgroundSettings.IsSpectrumOverlayEnabled, Mode=OneWay}">
+                        <ToggleSwitch IsOn="{x:Bind LyricsBackgroundSettings.IsSpectrumOverlayEnabled, Mode=TwoWay}" />
+                    </controls:SettingsExpander>
 
-                    <controls:SettingsCard x:Uid="SettingsPageBackgroundAcrylicEffectAmount" HeaderIcon="{ui:FontIcon FontFamily={StaticResource IconFontFamily}, Glyph=&#xE80A;}">
-                        <uc:ExtendedSlider
-                            Default="0"
-                            Frequency="1"
-                            Maximum="10"
-                            Minimum="0"
-                            Value="{x:Bind ViewModel.AppSettings.LyricsBackgroundSettings.CoverAcrylicEffectAmount, Mode=TwoWay}" />
-                    </controls:SettingsCard>
                 </StackPanel>
             </Grid>
         </ScrollViewer>

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

@@ -1,3 +1,4 @@
+using BetterLyrics.WinUI3.Models.Settings;
 using BetterLyrics.WinUI3.ViewModels;
 using CommunityToolkit.Mvvm.DependencyInjection;
 using Microsoft.UI.Xaml;
@@ -22,12 +23,18 @@ namespace BetterLyrics.WinUI3.Controls
 {
     public sealed partial class LyricsBackgroundSettingsControl : UserControl
     {
-        public LyricsBackgroundSettingsControlViewModel ViewModel => (LyricsBackgroundSettingsControlViewModel)DataContext;
+        public static readonly DependencyProperty LyricsBackgroundSettingsProperty =
+            DependencyProperty.Register(nameof(LyricsBackgroundSettings), typeof(LyricsBackgroundSettings), typeof(LyricsBackgroundSettingsControl), new PropertyMetadata(default));
+
+        public LyricsBackgroundSettings LyricsBackgroundSettings
+        {
+            get => (LyricsBackgroundSettings)GetValue(LyricsBackgroundSettingsProperty);
+            set => SetValue(LyricsBackgroundSettingsProperty, value);
+        }
 
         public LyricsBackgroundSettingsControl()
         {
             InitializeComponent();
-            DataContext = Ioc.Default.GetRequiredService<LyricsBackgroundSettingsControlViewModel>();
         }
     }
 }

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

@@ -0,0 +1,343 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<UserControl
+    x:Class="BetterLyrics.WinUI3.Controls.LyricsWindowSettingsControl"
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:controls="using:CommunityToolkit.WinUI.Controls"
+    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+    xmlns:interactivity="using:Microsoft.Xaml.Interactivity"
+    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    xmlns:uc="using:BetterLyrics.WinUI3.Controls"
+    xmlns:ui="using:CommunityToolkit.WinUI"
+    mc:Ignorable="d">
+
+    <Grid ColumnSpacing="6">
+        <Grid.ColumnDefinitions>
+            <ColumnDefinition Width="*" />
+            <ColumnDefinition Width="*" />
+        </Grid.ColumnDefinitions>
+        <Grid Grid.Column="0">
+            <ScrollViewer Style="{StaticResource SettingsScrollViewerStyle}">
+                <Grid Style="{StaticResource SettingsGridStyle}">
+
+                    <StackPanel Spacing="{StaticResource SettingsCardSpacing}">
+
+                        <TextBlock
+                            x:Uid="SettingsPageRecordedWindowStatus"
+                            RelativePanel.AlignLeftWithPanel="True"
+                            Style="{StaticResource SettingsSectionHeaderTextBlockStyle}" />
+                        <Button x:Uid="SettingsPageCreateFromCurrent" Command="{x:Bind ViewModel.CopyLyricsWindowStatusCommand}" />
+                        <Button
+                            x:Uid="SettingsPageCreateFromTemplates"
+                            VerticalAlignment="Center"
+                            RelativePanel.AlignRightWithPanel="True">
+                            <Button.Flyout>
+                                <MenuFlyout>
+                                    <MenuFlyoutItem x:Uid="SettingsPageStandardMode" Command="{x:Bind ViewModel.CreateStandardLyricsWindowStatusCommand}" />
+                                    <MenuFlyoutItem x:Uid="SettingsPageDesktopMode" Command="{x:Bind ViewModel.CreateTransparentLyricsWindowStatusCommand}" />
+                                    <MenuFlyoutItem x:Uid="SettingsPageDockedMode" Command="{x:Bind ViewModel.CreateDockedLyricsWindowStatusCommand}" />
+                                    <MenuFlyoutItem x:Uid="SettingsPageFullscreenMode" Command="{x:Bind ViewModel.CreateFullLyricsWindowStatusCommand}" />
+                                    <MenuFlyoutItem x:Uid="SettingsPageNarrowMode" Command="{x:Bind ViewModel.CreateNarrowLyricsWindowStatusCommand}" />
+                                </MenuFlyout>
+                            </Button.Flyout>
+                        </Button>
+
+                        <StackPanel
+                            Padding="24,0"
+                            Background="{ThemeResource CardBackgroundFillColorDefaultBrush}"
+                            CornerRadius="4"
+                            Spacing="16"
+                            Visibility="{Binding ElementName=LyricsWindowManagerExpander, Path=IsExpanded, Mode=OneWay, Converter={StaticResource BoolToVisibilityConverter}}">
+
+                            <ListView
+                                x:Name="WindowStatusListView"
+                                Padding="0,12"
+                                CornerRadius="4"
+                                ItemsSource="{x:Bind ViewModel.AppSettings.WindowBoundsRecords, Mode=OneWay}"
+                                SelectedItem="{x:Bind ViewModel.LiveStates.LyricsWindowStatus, Mode=TwoWay}">
+                                <ItemsControl.ItemsPanel>
+                                    <ItemsPanelTemplate>
+                                        <controls:WrapPanel HorizontalSpacing="0" VerticalSpacing="0" />
+                                    </ItemsPanelTemplate>
+                                </ItemsControl.ItemsPanel>
+                                <ListView.ItemTemplate>
+                                    <DataTemplate>
+                                        <StackPanel
+                                            Padding="0,10"
+                                            RightTapped="StackPanel_RightTapped"
+                                            Spacing="6">
+                                            <StackPanel.ContextFlyout>
+                                                <MenuBarItemFlyout>
+                                                    <MenuFlyoutItem
+                                                        x:Uid="LyricsWindowSettingsControlSetDefault"
+                                                        Click="SetDefaultMenuFlyoutItem_Click"
+                                                        IsEnabled="{Binding IsDefault, Mode=OneWay, Converter={StaticResource BoolNegationConverter}}" />
+                                                    <MenuFlyoutItem
+                                                        x:Uid="SettingsPageDelete"
+                                                        Click="DeleteMenuFlyoutItem_Click"
+                                                        IsEnabled="{Binding IsDefault, Mode=OneWay, Converter={StaticResource BoolNegationConverter}}" />
+                                                </MenuBarItemFlyout>
+                                            </StackPanel.ContextFlyout>
+                                            <uc:DemoWindowGrid LyricsWindowStatus="{Binding}" />
+                                        </StackPanel>
+                                    </DataTemplate>
+                                </ListView.ItemTemplate>
+                            </ListView>
+                        </StackPanel>
+
+                    </StackPanel>
+
+                </Grid>
+            </ScrollViewer>
+        </Grid>
+        <Grid Grid.Column="1">
+
+            <controls:SwitchPresenter Margin="0,100,0,0" Value="{x:Bind ViewModel.ListViewSelectedItemTag, Mode=OneWay}">
+                <controls:SwitchPresenter.ContentTransitions>
+                    <TransitionCollection>
+                        <PopupThemeTransition />
+                    </TransitionCollection>
+                </controls:SwitchPresenter.ContentTransitions>
+
+                <!--  General  -->
+                <controls:Case Value="General">
+                    <ScrollViewer Style="{StaticResource SettingsScrollViewerStyle}">
+                        <Grid Style="{StaticResource SettingsGridStyle}">
+                            <StackPanel Spacing="{StaticResource SettingsCardSpacing}">
+
+                                <TextBlock Style="{StaticResource SettingsSectionHeaderTextBlockStyle}" />
+
+                                <controls: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>
+                                </controls:SettingsCard>
+
+                                <controls:SettingsCard x:Uid="SettingsPageDockMonitor" HeaderIcon="{ui:FontIcon FontFamily={StaticResource IconFontFamily}, Glyph=&#xE7F4;}">
+                                    <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>
+                                </controls:SettingsCard>
+
+                                <controls:SettingsExpander
+                                    x:Uid="SettingsPageDisplayTypeSwitcher"
+                                    HeaderIcon="{ui:FontIcon FontFamily={StaticResource IconFontFamily},
+                                                             Glyph=&#xF246;}"
+                                    IsExpanded="True">
+                                    <ComboBox SelectedIndex="{x:Bind ViewModel.LiveStates.LyricsWindowStatus.LyricsDisplayType, Mode=TwoWay, Converter={StaticResource EnumToIntConverter}}">
+                                        <ComboBoxItem x:Uid="MainPageAlbumArtOnly" />
+                                        <ComboBoxItem x:Uid="MainPageLyriscOnly" />
+                                        <ComboBoxItem x:Uid="MainPageSplitView" />
+                                    </ComboBox>
+                                    <controls:SettingsExpander.Items>
+                                        <controls:SettingsCard x:Uid="SettingsPageLayoutOrientation">
+                                            <ComboBox SelectedIndex="{x:Bind ViewModel.LiveStates.LyricsWindowStatus.LyricsLayoutOrientation, Mode=TwoWay, Converter={StaticResource EnumToIntConverter}}">
+                                                <ComboBoxItem x:Uid="SettingsPageLayoutOrientationHorizontal" />
+                                                <ComboBoxItem x:Uid="SettingsPageLayoutOrientationVertical" />
+                                            </ComboBox>
+                                        </controls:SettingsCard>
+                                    </controls:SettingsExpander.Items>
+                                </controls:SettingsExpander>
+
+                                <controls:SettingsExpander
+                                    x:Uid="SettingsPageAOT"
+                                    HeaderIcon="{ui:FontIcon FontFamily={StaticResource IconFontFamily},
+                                                             Glyph=&#xE718;}"
+                                    IsExpanded="True">
+                                    <ToggleSwitch IsOn="{x:Bind ViewModel.LiveStates.LyricsWindowStatus.IsAlwaysOnTop, Mode=TwoWay}" />
+                                    <controls:SettingsExpander.Items>
+                                        <controls:SettingsCard x:Uid="SettingsPageForceAlwaysOnTop" IsEnabled="{x:Bind ViewModel.LiveStates.LyricsWindowStatus.IsAlwaysOnTop, Mode=OneWay}">
+                                            <ToggleSwitch IsOn="{x:Bind ViewModel.LiveStates.LyricsWindowStatus.IsAlwaysOnTopPolling, Mode=TwoWay}" />
+                                        </controls:SettingsCard>
+                                    </controls:SettingsExpander.Items>
+                                </controls:SettingsExpander>
+
+                                <controls: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}" />
+                                    <controls:SettingsExpander.Items>
+                                        <controls:SettingsCard x:Uid="SettingsPageWorkAreaHeight" IsEnabled="{x:Bind ViewModel.LiveStates.LyricsWindowStatus.IsWorkArea, Mode=OneWay}">
+                                            <uc:ExtendedSlider
+                                                Default="64"
+                                                Frequency="1"
+                                                Maximum="{x:Bind ViewModel.LiveStates.LyricsWindowStatus.MonitorBounds.Height, Mode=OneWay}"
+                                                Minimum="64"
+                                                Unit="px"
+                                                Value="{x:Bind ViewModel.LiveStates.LyricsWindowStatus.DockHeight, Mode=TwoWay}" />
+                                        </controls:SettingsCard>
+
+                                        <controls: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>
+                                        </controls:SettingsCard>
+                                    </controls:SettingsExpander.Items>
+                                </controls:SettingsExpander>
+
+                                <controls:SettingsCard x:Uid="SettingsPageHideWindow" HeaderIcon="{ui:FontIcon FontFamily={StaticResource IconFontFamily}, Glyph=&#xED1A;}">
+                                    <ToggleSwitch IsOn="{x:Bind ViewModel.LiveStates.LyricsWindowStatus.AutoShowOrHideWindow, Mode=TwoWay}" />
+                                </controls:SettingsCard>
+
+                            </StackPanel>
+                        </Grid>
+                    </ScrollViewer>
+                </controls:Case>
+
+                <!--  Album art area style  -->
+                <controls:Case Value="AlbumArtStyle">
+                    <uc:AlbumArtLayoutSettingsControl AlbumArtLayoutSettings="{x:Bind ViewModel.LiveStates.LyricsWindowStatus.AlbumArtLayoutSettings, Mode=OneWay}" />
+                </controls:Case>
+
+                <!--  Lyrics style and effect  -->
+                <controls:Case Value="Lyrics">
+                    <uc:LyricsSettingsControl LyricsEffectSettings="{x:Bind ViewModel.LiveStates.LyricsWindowStatus.LyricsEffectSettings, Mode=OneWay}" LyricsStyleSettings="{x:Bind ViewModel.LiveStates.LyricsWindowStatus.LyricsStyleSettings, Mode=OneWay}" />
+                </controls:Case>
+
+                <!--  Lyrics background  -->
+                <controls:Case Value="LyricsBackground">
+                    <uc:LyricsBackgroundSettingsControl LyricsBackgroundSettings="{x:Bind ViewModel.LiveStates.LyricsWindowStatus.LyricsBackgroundSettings, Mode=OneWay}" />
+                </controls:Case>
+
+                <!--  Advanced  -->
+                <controls:Case Value="Advanced">
+                    <ScrollViewer Style="{StaticResource SettingsScrollViewerStyle}">
+                        <Grid Style="{StaticResource SettingsGridStyle}">
+                            <StackPanel Spacing="{StaticResource SettingsCardSpacing}">
+
+                                <controls:SettingsCard x:Uid="SettingsPageShowInSwitchers" HeaderIcon="{ui:FontIcon FontFamily={StaticResource IconFontFamily}, Glyph=&#xE7C4;}">
+                                    <ToggleSwitch IsOn="{x:Bind ViewModel.LiveStates.LyricsWindowStatus.IsShownInSwitchers, Mode=TwoWay}" />
+                                </controls:SettingsCard>
+
+                                <controls:SettingsCard x:Uid="SettingsPageClickThrough" HeaderIcon="{ui:FontIcon FontFamily={StaticResource IconFontFamily}, Glyph=&#xE7C9;}">
+                                    <ToggleSwitch IsOn="{x:Bind ViewModel.LiveStates.LyricsWindowStatus.IsClickThrough, Mode=TwoWay}" />
+                                </controls:SettingsCard>
+
+                                <controls:SettingsCard x:Uid="SettingsPageBorderless" HeaderIcon="{ui:FontIcon FontFamily={StaticResource IconFontFamily}, Glyph=&#xE8B2;}">
+                                    <ToggleSwitch IsOn="{x:Bind ViewModel.LiveStates.LyricsWindowStatus.IsBorderless, Mode=TwoWay}" />
+                                </controls:SettingsCard>
+
+                                <controls: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}" />
+                                    <controls:SettingsExpander.Items>
+                                        <controls:SettingsCard x:Uid="SettingsPageEnvColorSample" Header="Environment color sample mode">
+                                            <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>
+                                        </controls:SettingsCard>
+                                    </controls:SettingsExpander.Items>
+                                </controls:SettingsExpander>
+
+                                <controls: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>
+                                </controls:SettingsCard>
+
+                            </StackPanel>
+                        </Grid>
+                    </ScrollViewer>
+                </controls:Case>
+
+            </controls:SwitchPresenter>
+
+            <Grid Padding="36,0" Style="{StaticResource SettingsGridStyle}">
+                <StackPanel Spacing="{StaticResource SettingsCardSpacing}">
+
+                    <TextBlock x:Uid="LyricsWindowSettingsControlCurrentLyricsWindowConfig" Style="{StaticResource SettingsSectionHeaderTextBlockStyle}" />
+
+                    <ListView
+                        ScrollViewer.HorizontalScrollBarVisibility="Auto"
+                        ScrollViewer.HorizontalScrollMode="Enabled"
+                        ScrollViewer.VerticalScrollBarVisibility="Disabled"
+                        ScrollViewer.VerticalScrollMode="Disabled"
+                        SelectionChanged="ListView_SelectionChanged">
+                        <ListView.ItemsPanel>
+                            <ItemsPanelTemplate>
+                                <ItemsStackPanel Orientation="Horizontal" />
+                            </ItemsPanelTemplate>
+                        </ListView.ItemsPanel>
+                        <ListView.Items>
+
+                            <ListViewItem Tag="General">
+                                <StackPanel Orientation="Horizontal" Spacing="6">
+                                    <FontIcon
+                                        FontFamily="{StaticResource IconFontFamily}"
+                                        FontSize="16"
+                                        Glyph="&#xECAA;" />
+                                    <TextBlock x:Uid="AppSettingsControlGeneral" VerticalAlignment="Center" />
+                                </StackPanel>
+                            </ListViewItem>
+
+                            <ListViewItem Tag="AlbumArtStyle">
+                                <StackPanel Orientation="Horizontal" Spacing="6">
+                                    <FontIcon
+                                        FontFamily="{StaticResource IconFontFamily}"
+                                        FontSize="16"
+                                        Glyph="&#xE93C;" />
+                                    <TextBlock x:Uid="SettingsPageAlbumStyle" VerticalAlignment="Center" />
+                                </StackPanel>
+                            </ListViewItem>
+
+                            <ListViewItem Tag="Lyrics">
+                                <StackPanel Orientation="Horizontal" Spacing="6">
+                                    <FontIcon
+                                        FontFamily="{StaticResource IconFontFamily}"
+                                        FontSize="16"
+                                        Glyph="&#xEDC6;" />
+                                    <TextBlock x:Uid="SettingsPageLyrics" VerticalAlignment="Center" />
+                                </StackPanel>
+                            </ListViewItem>
+
+                            <ListViewItem Tag="LyricsBackground">
+                                <StackPanel Orientation="Horizontal" Spacing="6">
+                                    <FontIcon
+                                        FontFamily="{StaticResource IconFontFamily}"
+                                        FontSize="16"
+                                        Glyph="&#xF5EF;" />
+                                    <TextBlock x:Uid="SettingsPageBackgroundOverlay" VerticalAlignment="Center" />
+                                </StackPanel>
+                            </ListViewItem>
+
+                            <ListViewItem Tag="Advanced">
+                                <StackPanel Orientation="Horizontal" Spacing="6">
+                                    <FontIcon
+                                        FontFamily="{StaticResource IconFontFamily}"
+                                        FontSize="16"
+                                        Glyph="&#xEC7A;" />
+                                    <TextBlock x:Uid="SettingsPageAdvanced" VerticalAlignment="Center" />
+                                </StackPanel>
+                            </ListViewItem>
+
+                        </ListView.Items>
+
+                    </ListView>
+
+                </StackPanel>
+            </Grid>
+
+        </Grid>
+    </Grid>
+</UserControl>

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

@@ -0,0 +1,84 @@
+using BetterLyrics.WinUI3.Helper;
+using BetterLyrics.WinUI3.Models;
+using BetterLyrics.WinUI3.Models.Settings;
+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.Controls.Primitives;
+using Microsoft.UI.Xaml.Data;
+using Microsoft.UI.Xaml.Input;
+using Microsoft.UI.Xaml.Media;
+using Microsoft.UI.Xaml.Navigation;
+using NTextCat.Commons;
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Runtime.InteropServices.WindowsRuntime;
+using Windows.Foundation;
+using Windows.Foundation.Collections;
+using static Vanara.PInvoke.ComCtl32;
+
+// 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 LyricsWindowSettingsControl : UserControl
+    {
+        public LyricsWindowSettingsControlViewModel ViewModel => (LyricsWindowSettingsControlViewModel)DataContext;
+
+        private ISettingsService _settingsService;
+
+        public LyricsWindowSettingsControl()
+        {
+            InitializeComponent();
+            DataContext = Ioc.Default.GetRequiredService<LyricsWindowSettingsControlViewModel>();
+            _settingsService = Ioc.Default.GetRequiredService<ISettingsService>();
+        }
+
+        private void DeleteMenuFlyoutItem_Click(object sender, RoutedEventArgs e)
+        {
+            if (sender is MenuFlyoutItem menuFlyoutItem)
+            {
+                var data = menuFlyoutItem.DataContext as LyricsWindowStatus;
+                if (data != null)
+                {
+                    ViewModel.AppSettings.WindowBoundsRecords.Remove(data);
+                }
+            }
+        }
+
+        private void ListView_SelectionChanged(object sender, SelectionChangedEventArgs e)
+        {
+            ViewModel?.ListViewSelectedItemTag = ((sender as ListView)!.SelectedItem as ListViewItem)!.Tag;
+        }
+
+        private void SetDefaultMenuFlyoutItem_Click(object sender, RoutedEventArgs e)
+        {
+            if (sender is MenuFlyoutItem menuFlyoutItem)
+            {
+                var data = menuFlyoutItem.DataContext as LyricsWindowStatus;
+                if (data != null)
+                {
+                    ViewModel.AppSettings.WindowBoundsRecords.ForEach(x => x.IsDefault = false);
+                    data.IsDefault = true;
+                }
+            }
+        }
+
+        private void StackPanel_RightTapped(object sender, RightTappedRoutedEventArgs e)
+        {
+            if (sender is StackPanel stackPanel)
+            {
+                if (stackPanel.DataContext is MenuBarItemFlyout menuBarItemFlyout)
+                {
+                    menuBarItemFlyout.ShowAt(stackPanel);
+                }
+            }
+        }
+    }
+}

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

@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<UserControl
+    x:Class="BetterLyrics.WinUI3.Controls.LyricsWindowSwitchControl"
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:controls="using:CommunityToolkit.WinUI.Controls"
+    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+    xmlns:interactivity="using:Microsoft.Xaml.Interactivity"
+    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    xmlns:uc="using:BetterLyrics.WinUI3.Controls"
+    xmlns:ui="using:CommunityToolkit.WinUI"
+    mc:Ignorable="d">
+
+    <Grid
+        HorizontalAlignment="Center"
+        VerticalAlignment="Center"
+        Background="{ThemeResource AcrylicInAppFillColorDefaultBrush}"
+        CornerRadius="12">
+        <Button
+            Margin="12"
+            HorizontalAlignment="Right"
+            VerticalAlignment="Top"
+            Click="Button_Click"
+            Content="{ui:FontIcon FontFamily={StaticResource IconFontFamily},
+                                  Glyph=&#xE653;}"
+            Style="{StaticResource GhostButtonStyle}" />
+        <ListView
+            Margin="48"
+            ItemsSource="{x:Bind ViewModel.AppSettings.WindowBoundsRecords, Mode=OneWay}"
+            SelectedItem="{x:Bind ViewModel.LiveStates.LyricsWindowStatus, Mode=TwoWay}">
+            <ItemsControl.ItemsPanel>
+                <ItemsPanelTemplate>
+                    <controls:WrapPanel HorizontalSpacing="0" VerticalSpacing="0" />
+                </ItemsPanelTemplate>
+            </ItemsControl.ItemsPanel>
+            <ListView.ItemTemplate>
+                <DataTemplate>
+                    <Grid
+                        Margin="0,10"
+                        Padding="5"
+                        AllowFocusOnInteraction="True"
+                        CornerRadius="4"
+                        Tapped="Grid_Tapped">
+                        <uc:DemoWindowGrid LyricsWindowStatus="{Binding}" />
+                    </Grid>
+                </DataTemplate>
+            </ListView.ItemTemplate>
+        </ListView>
+    </Grid>
+</UserControl>

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

@@ -1,4 +1,6 @@
+using BetterLyrics.WinUI3.Helper;
 using BetterLyrics.WinUI3.ViewModels;
+using BetterLyrics.WinUI3.Views;
 using CommunityToolkit.Mvvm.DependencyInjection;
 using Microsoft.UI.Xaml;
 using Microsoft.UI.Xaml.Controls;
@@ -20,13 +22,24 @@ using Windows.Foundation.Collections;
 
 namespace BetterLyrics.WinUI3.Controls
 {
-    public sealed partial class AllLyricsSettingsControl : UserControl
+    public sealed partial class LyricsWindowSwitchControl : UserControl
     {
-        public AllLyricsSettingsControlViewModel ViewModel => (AllLyricsSettingsControlViewModel)DataContext;
-        public AllLyricsSettingsControl()
+        public LyricsWindowSwitchControlViewModel ViewModel => (LyricsWindowSwitchControlViewModel)DataContext;
+
+        public LyricsWindowSwitchControl()
         {
             InitializeComponent();
-            DataContext = Ioc.Default.GetRequiredService<AllLyricsSettingsControlViewModel>();
+            DataContext = Ioc.Default.GetRequiredService<LyricsWindowSwitchControlViewModel>();
+        }
+
+        private void Grid_Tapped(object sender, TappedRoutedEventArgs e)
+        {
+            WindowHelper.HideWindow<LyricsWindowSwitchWindow>();
+        }
+
+        private void Button_Click(object sender, RoutedEventArgs e)
+        {
+            WindowHelper.HideWindow<LyricsWindowSwitchWindow>();
         }
     }
 }

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

@@ -122,8 +122,15 @@
                     </StackPanel>
                 </Grid>
             </ScrollViewer>
+
+            <!--  播放源列表  -->
             <ListView
+                x:Name="MediaSourceProvidersListView"
                 VerticalAlignment="Top"
+                AllowDrop="True"
+                CanDragItems="True"
+                CanReorderItems="True"
+                DragItemsCompleted="MediaSourceProvidersListView_DragItemsCompleted"
                 ItemsSource="{x:Bind ViewModel.AppSettings.MediaSourceProvidersInfo, Mode=OneWay}"
                 ScrollViewer.HorizontalScrollBarVisibility="Auto"
                 ScrollViewer.HorizontalScrollMode="Enabled"
@@ -138,6 +145,10 @@
                 <ListView.ItemTemplate>
                     <DataTemplate x:DataType="models:MediaSourceProviderInfo">
                         <StackPanel Orientation="Horizontal" Spacing="6">
+                            <FontIcon
+                                FontFamily="Segoe UI Symbol"
+                                FontSize="12"
+                                Glyph="&#x283F;" />
                             <ImageIcon Height="16" Source="{Binding Provider, Converter={StaticResource MediaSourceProviderToLogoUriConverter}, Mode=OneWay}" />
                             <TextBlock
                                 MaxWidth="200"
@@ -162,6 +173,7 @@
                 </interactivity:DataTriggerBehavior>
             </interactivity:Interaction.Behaviors>
         </Grid>
+
         <StackPanel
             Grid.Column="0"
             HorizontalAlignment="Center"
@@ -191,37 +203,16 @@
             <ScrollViewer Style="{StaticResource SettingsScrollViewerStyle}">
                 <Grid Style="{StaticResource SettingsGridStyle}">
                     <StackPanel Spacing="{StaticResource SettingsCardSpacing}">
-                        <!--  Last.fm  -->
-                        <TextBlock x:Uid="SettingsPageLastFM" Style="{StaticResource SettingsSectionHeaderTextBlockStyle}" />
-                        <controls:SettingsExpander
-                            x:Uid="SettingsPageLastFMManager"
-                            HeaderIcon="{ui:BitmapIcon Source=ms-appx:///Assets/LastFM.png}"
-                            IsExpanded="{x:Bind ViewModel.IsLastFMAuthenticated, Mode=OneWay}">
-                            <StackPanel Orientation="Horizontal" Spacing="6">
-                                <Button
-                                    x:Uid="SettingsPageLastFMAuth"
-                                    Command="{x:Bind ViewModel.LastFMAuthCommand}"
-                                    IsEnabled="{x:Bind ViewModel.IsLastFMAuthenticated, Mode=OneWay, Converter={StaticResource BoolNegationConverter}}" />
-                                <Button
-                                    x:Uid="SettingsPageLastFMUnAuth"
-                                    Command="{x:Bind ViewModel.LastFMUnAuthCommand}"
-                                    IsEnabled="{x:Bind ViewModel.IsLastFMAuthenticated, Mode=OneWay}" />
-                            </StackPanel>
-                            <controls:SettingsExpander.Items>
-                                <controls:SettingsCard x:Uid="SettingsPageLastFMUsername" IsEnabled="{x:Bind ViewModel.IsLastFMAuthenticated, Mode=OneWay}">
-                                    <HyperlinkButton Content="{x:Bind ViewModel.LastFMUser.Name, Mode=OneWay}" NavigateUri="{x:Bind ViewModel.LastFMUser.Url, Mode=OneWay}" />
-                                </controls:SettingsCard>
-                                <controls:SettingsCard x:Uid="SettingsPageLastFMPlaycount" IsEnabled="{x:Bind ViewModel.IsLastFMAuthenticated, Mode=OneWay}">
-                                    <TextBlock Text="{x:Bind ViewModel.LastFMUser.Playcount, Mode=OneWay}" />
-                                </controls:SettingsCard>
-                                <controls:SettingsCard x:Uid="SettingsPageLastFMRegistered" IsEnabled="{x:Bind ViewModel.IsLastFMAuthenticated, Mode=OneWay}">
-                                    <TextBlock Text="{x:Bind ViewModel.LastFMUser.Registered.ToLongDateString(), Mode=OneWay}" />
-                                </controls:SettingsCard>
-                                <controls:SettingsCard IsEnabled="{x:Bind ViewModel.IsLastFMAuthenticated, Mode=OneWay}">
-                                    <Button x:Uid="SettingsPageLastFMRefresh" Command="{x:Bind ViewModel.LastFMRefreshCommand}" />
-                                </controls:SettingsCard>
-                            </controls:SettingsExpander.Items>
-                        </controls:SettingsExpander>
+
+                        <!--  Provider info  -->
+                        <TextBlock x:Uid="SettingsPageRealtimeStatus" Style="{StaticResource SettingsSectionHeaderTextBlockStyle}" />
+                        <controls:SettingsCard x:Uid="LyricsPageLyricsProviderPrefix">
+                            <TextBlock Foreground="{ThemeResource TextFillColorSecondaryBrush}" Text="{x:Bind ViewModel.LyricsSearchProvider, Mode=OneWay, Converter={StaticResource LyricsSearchProviderToDisplayNameConverter}}" />
+                        </controls:SettingsCard>
+                        <controls:SettingsCard x:Uid="LyricsPageTranslationProviderPrefix">
+                            <TextBlock Foreground="{ThemeResource TextFillColorSecondaryBrush}" Text="{x:Bind ViewModel.TranslationSearchProvider, Mode=OneWay, Converter={StaticResource TranslationSearchProviderToDisplayNameConverter}}" />
+                        </controls:SettingsCard>
+
                         <!--  Lyrics translation  -->
                         <TextBlock x:Uid="SettingsPageTranslation" Style="{StaticResource SettingsSectionHeaderTextBlockStyle}" />
                         <controls:SettingsExpander
@@ -313,6 +304,7 @@
                                 </controls:SettingsCard>
                             </controls:SettingsExpander.Items>
                         </controls:SettingsExpander>
+
                         <!--  Lyrics phonetic  -->
                         <controls:SettingsExpander
                             x:Uid="SettingsPageChinese"
@@ -331,17 +323,44 @@
                         <controls:SettingsCard x:Uid="SettingsPageJapanese" IsEnabled="{x:Bind ViewModel.AppSettings.TranslationSettings.IsTranslationEnabled, Mode=OneWay}">
                             <ToggleSwitch IsOn="{x:Bind ViewModel.AppSettings.TranslationSettings.IsJapaneseRomanizationEnabled, Mode=TwoWay}" />
                         </controls:SettingsCard>
+
                         <!--  中文简体繁体偏好  -->
                         <controls:SettingsCard x:Uid="SettingsPageChinesePreference">
                             <ToggleSwitch IsOn="{x:Bind ViewModel.AppSettings.TranslationSettings.IsTraditionalChineseEnabled, Mode=TwoWay}" />
                         </controls:SettingsCard>
-                        <!--  Provider info  -->
-                        <controls:SettingsCard x:Uid="LyricsPageLyricsProviderPrefix">
-                            <TextBlock Foreground="{ThemeResource TextFillColorSecondaryBrush}" Text="{x:Bind ViewModel.LyricsSearchProvider, Mode=OneWay, Converter={StaticResource LyricsSearchProviderToDisplayNameConverter}}" />
-                        </controls:SettingsCard>
-                        <controls:SettingsCard x:Uid="LyricsPageTranslationProviderPrefix">
-                            <TextBlock Foreground="{ThemeResource TextFillColorSecondaryBrush}" Text="{x:Bind ViewModel.TranslationSearchProvider, Mode=OneWay, Converter={StaticResource TranslationSearchProviderToDisplayNameConverter}}" />
-                        </controls:SettingsCard>
+
+                        <!--  Last.fm  -->
+                        <TextBlock x:Uid="SettingsPageLastFM" Style="{StaticResource SettingsSectionHeaderTextBlockStyle}" />
+                        <controls:SettingsExpander
+                            x:Uid="SettingsPageLastFMManager"
+                            HeaderIcon="{ui:BitmapIcon Source=ms-appx:///Assets/LastFM.png}"
+                            IsExpanded="{x:Bind ViewModel.IsLastFMAuthenticated, Mode=OneWay}">
+                            <StackPanel Orientation="Horizontal" Spacing="6">
+                                <Button
+                                    x:Uid="SettingsPageLastFMAuth"
+                                    Command="{x:Bind ViewModel.LastFMAuthCommand}"
+                                    IsEnabled="{x:Bind ViewModel.IsLastFMAuthenticated, Mode=OneWay, Converter={StaticResource BoolNegationConverter}}" />
+                                <Button
+                                    x:Uid="SettingsPageLastFMUnAuth"
+                                    Command="{x:Bind ViewModel.LastFMUnAuthCommand}"
+                                    IsEnabled="{x:Bind ViewModel.IsLastFMAuthenticated, Mode=OneWay}" />
+                            </StackPanel>
+                            <controls:SettingsExpander.Items>
+                                <controls:SettingsCard x:Uid="SettingsPageLastFMUsername" IsEnabled="{x:Bind ViewModel.IsLastFMAuthenticated, Mode=OneWay}">
+                                    <HyperlinkButton Content="{x:Bind ViewModel.LastFMUser.Name, Mode=OneWay}" NavigateUri="{x:Bind ViewModel.LastFMUser.Url, Mode=OneWay}" />
+                                </controls:SettingsCard>
+                                <controls:SettingsCard x:Uid="SettingsPageLastFMPlaycount" IsEnabled="{x:Bind ViewModel.IsLastFMAuthenticated, Mode=OneWay}">
+                                    <TextBlock Text="{x:Bind ViewModel.LastFMUser.Playcount, Mode=OneWay}" />
+                                </controls:SettingsCard>
+                                <controls:SettingsCard x:Uid="SettingsPageLastFMRegistered" IsEnabled="{x:Bind ViewModel.IsLastFMAuthenticated, Mode=OneWay}">
+                                    <TextBlock Text="{x:Bind ViewModel.LastFMUser.Registered.ToLongDateString(), Mode=OneWay}" />
+                                </controls:SettingsCard>
+                                <controls:SettingsCard IsEnabled="{x:Bind ViewModel.IsLastFMAuthenticated, Mode=OneWay}">
+                                    <Button x:Uid="SettingsPageLastFMRefresh" Command="{x:Bind ViewModel.LastFMRefreshCommand}" />
+                                </controls:SettingsCard>
+                            </controls:SettingsExpander.Items>
+                        </controls:SettingsExpander>
+
                         <!--  LX music server  -->
                         <TextBlock x:Uid="SettingsPageLXMusicServer" Style="{StaticResource SettingsSectionHeaderTextBlockStyle}" />
                         <controls:SettingsCard>
@@ -356,6 +375,7 @@
                                     IsEnabled="{x:Bind ViewModel.IsLXMusicServerTesting, Converter={StaticResource BoolNegationConverter}, Mode=OneWay}" />
                             </StackPanel>
                         </controls:SettingsCard>
+
                         <!--  Apple Music token  -->
                         <TextBlock Style="{StaticResource SettingsSectionHeaderTextBlockStyle}" Text="media-user-token (for Apple Muisc)" />
                         <controls:SettingsCard
@@ -376,6 +396,7 @@
                                     Style="{StaticResource GhostButtonStyle}" />
                             </StackPanel>
                         </controls:SettingsCard>
+
                     </StackPanel>
                 </Grid>
             </ScrollViewer>

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

@@ -41,5 +41,11 @@ namespace BetterLyrics.WinUI3.Controls
             // <20><> LyricsSearchProvidersInfo <20><><EFBFBD><EFBFBD> CollectionChanged <20>¼<EFBFBD>
             ViewModel.SelectedMediaSourceProvider?.LyricsSearchProvidersInfo?.Refresh();
         }
+
+        private void MediaSourceProvidersListView_DragItemsCompleted(ListViewBase sender, DragItemsCompletedEventArgs args)
+        {
+            // <20><> MediaSourceProvidersInfo <20><><EFBFBD><EFBFBD> CollectionChanged <20>¼<EFBFBD>
+            ViewModel.AppSettings.MediaSourceProvidersInfo?.Refresh();
+        }
     }
 }

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

@@ -50,12 +50,6 @@
                     Command="{x:Bind ViewModel.ResetWindowPositionCommand}"
                     Icon="{ui:FontIcon FontFamily={StaticResource IconFontFamily},
                                        Glyph=}" />
-                <MenuFlyoutItem
-                    x:Uid="SystemTrayUnlock"
-                    Command="{x:Bind ViewModel.UnlockWindowCommand}"
-                    Icon="{ui:FontIcon FontFamily={StaticResource IconFontFamily},
-                                       Glyph=&#xE785;}"
-                    Visibility="{x:Bind ViewModel.IsLyricsWindowLocked, Mode=OneWay, Converter={StaticResource BoolToVisibilityConverter}}" />
                 <MenuFlyoutSeparator />
                 <MenuFlyoutItem
                     x:Uid="SystemTrayRestart"

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Converter/MediaSourceProviderToDisplayedNameConverter.cs

@@ -33,6 +33,10 @@ namespace BetterLyrics.WinUI3.Converter
                     PlayerID.Edge => PlayerName.Edge,
                     PlayerID.BetterLyrics => PlayerName.BetterLyrics,
                     PlayerID.BetterLyricsDebug => PlayerName.BetterLyricsDebug,
+                    PlayerID.SaltPlayerForWindows => PlayerName.SaltPlayerForWindows,
+                    PlayerID.MoeKoeMusic => PlayerName.MoeKoeMusic,
+                    PlayerID.MoeKoeMusicAlternative => PlayerName.MoeKoeMusic,
+                    PlayerID.Listen1 => PlayerName.Listen1,
                     _ => provider,
                 };
             }

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Converter/MediaSourceProviderToLogoUriConverter.cs

@@ -30,6 +30,10 @@ namespace BetterLyrics.WinUI3.Converter
                     PlayerID.Edge => PathHelper.EdgeLogoPath,
                     PlayerID.BetterLyrics => PathHelper.LogoPath,
                     PlayerID.BetterLyricsDebug => PathHelper.LogoPath,
+                    PlayerID.SaltPlayerForWindows => PathHelper.SaltPlayerForWindowsLogoPath,
+                    PlayerID.MoeKoeMusic => PathHelper.MoeKoeMusicLogoPath,
+                    PlayerID.MoeKoeMusicAlternative => PathHelper.MoeKoeMusicLogoPath,
+                    PlayerID.Listen1 => PathHelper.Listen1LogoPath,
                     _ => PathHelper.UnknownPlayerLogoPath,
                 };
             }

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Enums/LyricsWindowMode.cs

@@ -1,12 +0,0 @@
-// 2025/6/23 by Zhe Fang
-
-namespace BetterLyrics.WinUI3.Enums
-{
-    public enum LyricsWindowMode
-    {
-        StandardMode,
-        DockMode,
-        DesktopMode,
-        PictureInPictureMode,
-    }
-}

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

@@ -9,10 +9,9 @@ namespace BetterLyrics.WinUI3.Enums
     public enum ShortcutID
     {
         LyricsWindowShowOrHide,
-        DesktopLockOrUnlock,
-        DesktopToggle,
-        DockToggle,
-        PictureInPictureToggle,
+        Borderless,
+        ClickThrough,
+        LyricsWindowSwitch,
         PlayOrPauseSong,
         NextSong,
         PreviousSong,

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Enums/TitleBarArea.cs

@@ -0,0 +1,15 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace BetterLyrics.WinUI3.Enums
+{
+    public  enum TitleBarArea
+    {
+        None,
+        Top,
+        Whole,
+    }
+}

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Events/AlbumArtChangedEventArgs.cs

@@ -8,11 +8,11 @@ using Windows.UI;
 
 namespace BetterLyrics.WinUI3.Events
 {
-    public class AlbumArtChangedEventArgs(byte[]? bytes, SoftwareBitmap? albumArtSwBitmap, Color? albumArtLightAccentColor, Color? albumArtDarkAccentColor) : EventArgs
+    public class AlbumArtChangedEventArgs(byte[]? bytes, SoftwareBitmap? albumArtSwBitmap, List<Color> albumArtLightAccentColors, List<Color> albumArtDarkAccentColors) : EventArgs
     {
         public byte[]? Bytes { get; set; } = bytes;
         public SoftwareBitmap? AlbumArtSwBitmap { get; set; } = albumArtSwBitmap;
-        public Color? AlbumArtLightAccentColor { get; set; } = albumArtLightAccentColor;
-        public Color? AlbumArtDarkAccentColor { get; set; } = albumArtDarkAccentColor;
+        public List<Color> AlbumArtLightAccentColors { get; set; } = albumArtLightAccentColors;
+        public List<Color> AlbumArtDarkAccentColors { get; set; } = albumArtDarkAccentColors;
     }
 }

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Helper/ColorHelper.cs

@@ -7,6 +7,7 @@ using System;
 using System.Collections.Generic;
 using System.Drawing;
 using System.Drawing.Imaging;
+using System.Numerics;
 using Vanara.PInvoke;
 using Windows.UI;
 
@@ -111,6 +112,11 @@ namespace BetterLyrics.WinUI3.Helper
             return CommunityToolkit.WinUI.Helpers.ColorHelper.FromHsl(h, s, brightness);
         }
 
+        public static Vector3 ToVector3RGB(this Color color)
+        {
+            return new Vector3((float)color.R / 0xff, (float)color.G / 0xff, (float)color.B / 0xff);
+        }
+
         public static System.Drawing.Color GetAccentColor(IntPtr myHwnd, string monitorDeviceName, WindowPixelSampleMode mode)
         {
             if (!User32.GetWindowRect(myHwnd, out RECT myRect)) return System.Drawing.Color.Transparent;
@@ -247,6 +253,5 @@ namespace BetterLyrics.WinUI3.Helper
             if (count == 0) return System.Drawing.Color.Transparent;
             return System.Drawing.Color.FromArgb((int)(r / count), (int)(g / count), (int)(b / count));
         }
-
     }
 }

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Helper/DesktopModeHelper.cs

@@ -1,109 +0,0 @@
-using BetterLyrics.WinUI3.Enums;
-using BetterLyrics.WinUI3.Services.SettingsService;
-using CommunityToolkit.Mvvm.DependencyInjection;
-using Microsoft.UI.Windowing;
-using Microsoft.UI.Xaml;
-using System;
-using System.Collections.Generic;
-using System.Drawing;
-using System.Linq;
-using System.Runtime.InteropServices;
-using Vanara.PInvoke;
-using WinRT.Interop;
-using WinUIEx;
-
-namespace BetterLyrics.WinUI3.Helper
-{
-    public static class DesktopModeHelper
-    {
-        private static readonly ISettingsService _settingsService = Ioc.Default.GetRequiredService<ISettingsService>();
-
-        private static readonly Dictionary<IntPtr, bool> _originalTopmostStates = [];
-        private static readonly Dictionary<IntPtr, (double X, double Y, double Width, double Height)> _originalWindowBounds = [];
-        private static readonly Dictionary<IntPtr, WindowStyle> _originalWindowStyles = [];
-
-        private delegate nint WndProcDelegate(nint hWnd, uint msg, nint wParam, nint lParam);
-
-        public static void Disable(Window window)
-        {
-            IntPtr hwnd = WindowNative.GetWindowHandle(window);
-
-            // <20>ָ<EFBFBD>TopMost״̬
-            if (_originalTopmostStates.TryGetValue(hwnd, out var wasTopMost))
-            {
-                window.SetIsAlwaysOnTop(wasTopMost);
-                _originalTopmostStates.Remove(hwnd);
-            }
-
-            // <20>ָ<EFBFBD><D6B8><EFBFBD><EFBFBD><EFBFBD>λ<EFBFBD>úʹ<C3BA>С
-            if (_originalWindowBounds.TryGetValue(hwnd, out var bounds))
-            {
-                window.AppWindow.MoveAndResize(
-                    new Windows.Graphics.RectInt32(
-                        (int)bounds.X,
-                        (int)bounds.Y,
-                        (int)bounds.Width,
-                        (int)bounds.Height
-                    )
-                );
-                _originalWindowBounds.Remove(hwnd);
-            }
-
-            window.SetIsShownInSwitchers(true);
-        }
-
-        public static void Enable(Window window)
-        {
-            IntPtr hwnd = WindowNative.GetWindowHandle(window);
-
-            // <20><>¼ԭʼ<D4AD><CABC><EFBFBD><EFBFBD>λ<EFBFBD>úʹ<C3BA>С
-            if (!_originalWindowBounds.ContainsKey(hwnd))
-            {
-                _originalWindowBounds[hwnd] = (
-                    window.AppWindow.Position.X,
-                    window.AppWindow.Position.Y,
-                    window.AppWindow.Size.Width,
-                    window.AppWindow.Size.Height
-                );
-            }
-
-            // <20><><EFBFBD>ô<EFBFBD><C3B4>ڴ<EFBFBD>С<EFBFBD><D0A1>λ<EFBFBD><CEBB>
-            window.AppWindow.MoveAndResize(_settingsService.AppSettings.DesktopModeSettings.WindowBounds.ToRectInt32());
-
-            // <20><><EFBFBD><EFBFBD>ԭTopMost״̬
-            if (!_originalTopmostStates.ContainsKey(hwnd))
-                _originalTopmostStates[hwnd] = window.GetIsAlwaysOnTop();
-
-            // <20><><EFBFBD>ô<EFBFBD><C3B4><EFBFBD><EFBFBD>ö<EFBFBD>
-            window.SetIsAlwaysOnTop(true);
-
-            window.SetIsShownInSwitchers(false);
-        }
-
-        public static void SetClickThrough(Window window, bool enable)
-        {
-            IntPtr hwnd = WindowNative.GetWindowHandle(window);
-            int exStyle = User32.GetWindowLong(hwnd, User32.WindowLongFlags.GWL_EXSTYLE);
-
-            if (enable)
-            {
-                // <20><><EFBFBD><EFBFBD>ԭ<EFBFBD><D4AD>ʽ
-                if (!_originalWindowStyles.ContainsKey(hwnd))
-                    _originalWindowStyles[hwnd] = window.GetWindowStyle();
-
-                window.ToggleWindowStyle(true, WindowStyle.Popup | WindowStyle.Visible);
-                User32.SetWindowLong(hwnd, User32.WindowLongFlags.GWL_EXSTYLE, exStyle | (int)User32.WindowStylesEx.WS_EX_TRANSPARENT | (int)User32.WindowStylesEx.WS_EX_LAYERED);
-            }
-            else
-            {
-                User32.SetWindowLong(hwnd, User32.WindowLongFlags.GWL_EXSTYLE, exStyle & ~(int)User32.WindowStylesEx.WS_EX_TRANSPARENT);
-                // <20>ָ<EFBFBD><D6B8><EFBFBD>ʽ
-                if (_originalWindowStyles.TryGetValue(hwnd, out var style))
-                {
-                    window.SetWindowStyle(style);
-                    _originalWindowStyles.Remove(hwnd);
-                }
-            }
-        }
-    }
-}

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Helper/DockModeHelper.cs

@@ -1,205 +0,0 @@
-using BetterLyrics.WinUI3.Enums;
-using BetterLyrics.WinUI3.Services.SettingsService;
-using CommunityToolkit.Mvvm.DependencyInjection;
-using CommunityToolkit.WinUI;
-using Microsoft.UI.Xaml;
-using System;
-using System.Collections.Generic;
-using System.Drawing;
-using System.Linq;
-using System.Runtime.InteropServices;
-using System.Text;
-using System.Threading.Tasks;
-using Vanara.PInvoke;
-using WinRT.Interop;
-using WinUIEx;
-
-namespace BetterLyrics.WinUI3.Helper
-{
-    public static class DockModeHelper
-    {
-        private static readonly ISettingsService _settingsService = Ioc.Default.GetRequiredService<ISettingsService>();
-
-        private static readonly HashSet<IntPtr> _registered = [];
-        private static readonly Dictionary<IntPtr, RECT> _originalPositions = [];
-        private static readonly Dictionary<IntPtr, WindowStyle> _originalWindowStyle = [];
-
-        public static bool IsEnabled(IntPtr hwnd)
-        {
-            return _registered.Contains(hwnd);
-        }
-
-        public static void Disable(Window window)
-        {
-            IntPtr hwnd = WindowNative.GetWindowHandle(window);
-
-            if (!_registered.Contains(hwnd)) return;
-
-            window.SetIsShownInSwitchers(true);
-            window.ExtendsContentIntoTitleBar = true;
-            window.SetIsAlwaysOnTop(false);
-
-            UnregisterAppBar(hwnd);
-
-            window.SetWindowStyle(_originalWindowStyle[hwnd]);
-            _originalWindowStyle.Remove(hwnd);
-
-            window.ExtendsContentIntoTitleBar = true;
-
-            if (_originalPositions.TryGetValue(hwnd, out var rect))
-            {
-                User32.SetWindowPos(
-                    hwnd,
-                    IntPtr.Zero,
-                    rect.Left,
-                    rect.Top,
-                    rect.Right - rect.Left,
-                    rect.Bottom - rect.Top,
-                    User32.SetWindowPosFlags.SWP_SHOWWINDOW
-                );
-                _originalPositions.Remove(hwnd);
-            }
-        }
-
-        public static void Enable(Window window, string monitorDeviceName, int appBarHeight, DockPlacement dockPlacement)
-        {
-            window.SetIsShownInSwitchers(false);
-            window.SetIsAlwaysOnTop(true);
-
-            IntPtr hwnd = WindowNative.GetWindowHandle(window);
-
-            if (!_originalWindowStyle.ContainsKey(hwnd))
-            {
-                _originalWindowStyle[hwnd] = window.GetWindowStyle();
-            }
-
-            if (!_originalPositions.ContainsKey(hwnd))
-            {
-                if (User32.GetWindowRect(hwnd, out var rect))
-                {
-                    _originalPositions[hwnd] = rect;
-                }
-            }
-
-            RegisterAppBar(hwnd, monitorDeviceName, appBarHeight, dockPlacement);
-
-            var monitorInfo = MonitorHelper.GetMonitorInfoExFromDeviceName(_settingsService.AppSettings.DockModeSettings.DockMonitorDeviceName);
-
-            int screenWidth = monitorInfo.rcMonitor.Width;
-            int screenHeight = monitorInfo.rcMonitor.Bottom - monitorInfo.rcMonitor.Top;
-            int y = dockPlacement == DockPlacement.Top ? monitorInfo.rcMonitor.Top : monitorInfo.rcMonitor.Bottom - appBarHeight;
-
-            User32.SetWindowPos(
-                hwnd,
-                IntPtr.Zero,
-                monitorInfo.rcMonitor.Left,
-                y,
-                screenWidth,
-                appBarHeight,
-                User32.SetWindowPosFlags.SWP_HIDEWINDOW
-            );
-            window.ExtendsContentIntoTitleBar = false;
-            window.ToggleWindowStyle(true, WindowStyle.Popup);
-            window.Show();
-        }
-
-        private static void RegisterAppBar(IntPtr hwnd, string monitorDeviceName, int height, DockPlacement dockPlacement)
-        {
-            if (_registered.Contains(hwnd)) return;
-
-            var uEdge = dockPlacement == DockPlacement.Top ? Shell32.ABE.ABE_TOP : Shell32.ABE.ABE_BOTTOM;
-
-            var monitorInfo = MonitorHelper.GetMonitorInfoExFromDeviceName(monitorDeviceName);
-
-            int top = dockPlacement == DockPlacement.Top ? monitorInfo.rcMonitor.Top : monitorInfo.rcMonitor.Bottom - height;
-            int bottom = dockPlacement == DockPlacement.Top ? monitorInfo.rcMonitor.Top + height : monitorInfo.rcMonitor.Bottom;
-
-            Shell32.APPBARDATA abd = new()
-            {
-                cbSize = (uint)Marshal.SizeOf<Shell32.APPBARDATA>(),
-                hWnd = hwnd,
-                uEdge = uEdge,
-                rc = new RECT
-                {
-                    Left = monitorInfo.rcMonitor.Left,
-                    Top = top,
-                    Right = monitorInfo.rcMonitor.Right,
-                    Bottom = bottom,
-                },
-            };
-
-            Shell32.SHAppBarMessage(Shell32.ABM.ABM_NEW, ref abd);
-            Shell32.SHAppBarMessage(Shell32.ABM.ABM_QUERYPOS, ref abd);
-            Shell32.SHAppBarMessage(Shell32.ABM.ABM_SETPOS, ref abd);
-
-            _registered.Add(hwnd);
-        }
-
-        private static void UnregisterAppBar(IntPtr hwnd)
-        {
-            if (!_registered.Contains(hwnd))
-                return;
-
-            Shell32.APPBARDATA abd = new()
-            {
-                cbSize = (uint)Marshal.SizeOf<Shell32.APPBARDATA>(),
-                hWnd = hwnd
-            };
-
-            Shell32.SHAppBarMessage(Shell32.ABM.ABM_REMOVE, ref abd);
-
-            _registered.Remove(hwnd);
-        }
-
-        public static void UpdateAppBarHeight(IntPtr hwnd, string monitorDeviceName, int newHeight, DockPlacement dockPlacement)
-        {
-            App.DispatcherQueueTimer?.Debounce(() =>
-            {
-                if (!_registered.Contains(hwnd))
-                    return;
-
-                var uEdge = dockPlacement == DockPlacement.Top ? Shell32.ABE.ABE_TOP : Shell32.ABE.ABE_BOTTOM;
-
-                var monitorInfo = MonitorHelper.GetMonitorInfoExFromDeviceName(monitorDeviceName);
-
-                int screenWidth = monitorInfo.rcMonitor.Width;
-                int top = dockPlacement == DockPlacement.Top ? monitorInfo.rcMonitor.Top : monitorInfo.rcMonitor.Bottom - newHeight;
-                int bottom = dockPlacement == DockPlacement.Top ? monitorInfo.rcMonitor.Top + newHeight : monitorInfo.rcMonitor.Bottom;
-
-                Shell32.APPBARDATA abd = new()
-                {
-                    cbSize = (uint)Marshal.SizeOf<Shell32.APPBARDATA>(),
-                    hWnd = hwnd,
-                    uEdge = uEdge,
-                    rc = new RECT
-                    {
-                        Left = monitorInfo.rcMonitor.Left,
-                        Top = top,
-                        Right = monitorInfo.rcMonitor.Right,
-                        Bottom = bottom,
-                    },
-                };
-
-                Shell32.SHAppBarMessage(Shell32.ABM.ABM_QUERYPOS, ref abd);
-                Shell32.SHAppBarMessage(Shell32.ABM.ABM_SETPOS, ref abd);
-
-                // 同步窗口实际高度和位置
-                int y = dockPlacement == DockPlacement.Top ? monitorInfo.rcMonitor.Top : monitorInfo.rcMonitor.Bottom - newHeight;
-                int repeatCount = 2;
-                while (repeatCount > 0)
-                {
-                    repeatCount--;
-                    User32.SetWindowPos(
-                        hwnd,
-                        IntPtr.Zero,
-                        monitorInfo.rcMonitor.Left,
-                        y,
-                        screenWidth,
-                        newHeight,
-                        newHeight == 0 ? User32.SetWindowPosFlags.SWP_HIDEWINDOW : User32.SetWindowPosFlags.SWP_SHOWWINDOW
-                    );
-                }
-            }, TimeSpan.FromMilliseconds(100));
-        }
-    }
-}

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Helper/ForegroundWindowWatcher.cs

@@ -17,7 +17,6 @@ namespace BetterLyrics.WinUI3.Helper
         private readonly List<User32.HWINEVENTHOOK> _hooks = new();
         private HWND _currentForeground = HWND.NULL;
         private readonly IntPtr _selfHwnd;
-        private readonly ThrottleHelper _winEventProcThrottle = new(TimeSpan.FromSeconds(1));
 
         public delegate void WindowChangedHandler(HWND hwnd);
         private readonly WindowChangedHandler _onWindowChanged;
@@ -73,7 +72,7 @@ namespace BetterLyrics.WinUI3.Helper
 
             _hooks.Clear();
 
-            _timer.Stop();
+            //_timer.Stop();
         }
 
         private void Timer_Tick(object? sender, object e)

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Helper/PathHelper.cs

@@ -34,6 +34,10 @@ namespace BetterLyrics.WinUI3.Helper
         public static string PotPlayerLogoPath => Path.Combine(AssetsFolder, "PotPlayer.png");
         public static string ChromeLogoPath => Path.Combine(AssetsFolder, "Chrome.png");
         public static string EdgeLogoPath => Path.Combine(AssetsFolder, "Edge.png");
+        public static string SaltPlayerForWindowsLogoPath => Path.Combine(AssetsFolder, "SaltPlayerForWindows.png");
+        public static string MoeKoeMusicLogoPath => Path.Combine(AssetsFolder, "MoeKoeMusic.png");
+        public static string Listen1LogoPath => Path.Combine(AssetsFolder, "Listen1.png");
+
         public static string UnknownPlayerLogoPath => Path.Combine(AssetsFolder, "Question.png");
 
         public static string LogDirectory => Path.Combine(CacheFolder, "logs");

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Helper/RectHelper.cs

@@ -18,5 +18,25 @@ namespace BetterLyrics.WinUI3.Helper
                 (int)rect.Height
             );
         }
+
+        public static Windows.Foundation.Rect WithHeight(this Windows.Foundation.Rect rect, double height)
+        {
+            return new Windows.Foundation.Rect(
+                rect.X,
+                rect.Y,
+                rect.Width,
+                height
+            );
+        }
+
+        public static Windows.Foundation.Rect WithWidth(this Windows.Foundation.Rect rect, double width)
+        {
+            return new Windows.Foundation.Rect(
+                rect.X,
+                rect.Y,
+                width,
+                rect.Height
+            );
+        }
     }
 }

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Helper/SpectrumAnalyzer.cs

@@ -0,0 +1,181 @@
+using BetterLyrics.WinUI3.Models.Settings;
+using NAudio.Dsp;
+using NAudio.Wave;
+using System;
+using System.Diagnostics;
+
+namespace BetterLyrics.WinUI3.Helper
+{
+    public class SpectrumAnalyzer : IDisposable
+    {
+        private WasapiLoopbackCapture _capture;
+        
+        private int _sampleRate = 48000;
+        private readonly int _fftLength = 2048;
+        
+        private readonly float[] _fftLeftBuffer;
+        private readonly float[] _fftRightBuffer;
+
+        private readonly Complex[] _fftLeftData;
+        private readonly Complex[] _fftRightData;
+        
+        private float[] _spectrumLeftData;
+        private float[] _spectrumRightData;
+        private float[] _spectrumData;
+
+        private bool _disposed = false;
+        
+        private double[] _hammingWindow;
+
+        private float[] _currentSpectrum;
+        public float[] SmoothSpectrum { get; private set; }
+        
+        public int BarCount { get; set; } = 32;
+        public int Sensitivity { get; set; } = 10;
+        public float SmoothingFactor { get; set; } = 0.95f;
+        public bool IsCapturing { get; private set; } = false;
+
+        public SpectrumAnalyzer()
+        {
+            _fftLeftBuffer = new float[_fftLength];
+            _fftLeftData = new Complex[_fftLength];
+            _fftRightBuffer = new float[_fftLength];
+            _fftRightData = new Complex[_fftLength];
+            _hammingWindow = new double[_fftLength];
+            //汉明窗
+            for (int i = 0; i < _fftLength; i++)
+            {
+                _hammingWindow[i] = 0.54 - 0.46 * Math.Cos((2 * Math.PI * i) / (_fftLength - 1));
+            }
+        }
+
+        public void StartCapture()
+        {
+            _currentSpectrum = new float[BarCount];
+            SmoothSpectrum = new float[BarCount];
+
+            try
+            {
+                _capture = new WasapiLoopbackCapture();
+                _sampleRate = _capture.WaveFormat.SampleRate;
+                _spectrumLeftData = new float[(int)(24000.0f / _sampleRate * _fftLength) / 2];
+                _spectrumRightData = new float[(int)(24000.0f / _sampleRate * _fftLength) / 2];
+                _spectrumData = new float[(int)(24000.0f / _sampleRate * _fftLength)];
+                _capture.DataAvailable += OnDataAvailable;
+                _capture.RecordingStopped += OnRecordingStopped;
+                _capture.StartRecording();
+
+                IsCapturing = true;
+            }
+            catch (Exception)
+            {
+            }
+        }
+
+        public void StopCapture()
+        {
+            _capture?.DataAvailable -= OnDataAvailable;
+            _capture?.RecordingStopped -= OnRecordingStopped;
+            _capture?.StopRecording();
+
+            IsCapturing = false;
+        }
+
+        private void OnDataAvailable(object? sender, WaveInEventArgs e)
+        {
+            if (_disposed || e.BytesRecorded == 0) return;
+            // 将字节转换为浮点数
+            int samples = e.BytesRecorded / 8;
+            if (samples < _fftLength) return;
+            for (int i = 0; i < _fftLength; i++)
+            {
+                _fftLeftBuffer[i] = BitConverter.ToSingle(e.Buffer, i * 8);
+                _fftRightBuffer[i] = BitConverter.ToSingle(e.Buffer, i * 8 + 4);
+            }
+            for (int i = 0; i < _fftLength; i++)
+            {
+                _fftLeftData[i].X = _fftLeftBuffer[i] * (float)_hammingWindow[i]; // Real part
+                _fftLeftData[i].Y = 0;             // Imaginary part
+                _fftRightData[i].X = _fftRightBuffer[i] * (float)_hammingWindow[i];
+                _fftRightData[i].Y = 0;
+            }
+
+            // FFT
+            FastFourierTransform.FFT(true, (int)Math.Log(_fftLength, 2), _fftLeftData);
+            FastFourierTransform.FFT(true, (int)Math.Log(_fftLength, 2), _fftRightData);
+            for (int i = 0; i < _spectrumLeftData.Length; i++)
+            {
+                float real = (float)_fftLeftData[i].X;
+                float imaginary = (float)_fftLeftData[i].Y;
+                float magnitude = (float)Math.Sqrt(real * real + imaginary * imaginary);
+                float frequency = i * _sampleRate / _fftLength;
+                float compensationFactor = GetCompensationFactor(frequency);
+                _spectrumLeftData[i] = magnitude * compensationFactor;
+                _spectrumRightData[i] = (float)Math.Sqrt((float)_fftRightData[i].X * (float)_fftRightData[i].X + (float)_fftRightData[i].Y * (float)_fftRightData[i].Y) * compensationFactor;
+                for (int j = 0; j < _spectrumLeftData.Length; j++)
+                {
+                    _spectrumData[j] = _spectrumLeftData[_spectrumLeftData.Length - 1 - j];
+                }
+                Array.Copy(_spectrumRightData, 0, _spectrumData, _spectrumLeftData.Length, _spectrumRightData.Length);
+            }
+
+            for (int i = 0; i < BarCount; i++)
+            {
+                int index = (int)((float)i / BarCount * _spectrumData.Length);
+                if (index < _spectrumData.Length)
+                {
+                    _currentSpectrum[i] = _spectrumData[index] * 250f * Sensitivity;
+                }
+            }
+
+        }
+
+        public void UpdateSmoothSpectrum()
+        {
+            for (int i = 0; i < BarCount; i++)
+            {
+                SmoothSpectrum[i] = SmoothSpectrum[i] * SmoothingFactor +
+                    _currentSpectrum[i] * (1 - SmoothingFactor);
+            }
+        }
+
+        private float GetCompensationFactor(float freq)
+        {
+            // 补偿曲线
+            float[] frequencies = { 20, 50, 100, 200, 500, 1000, 2000, 4000, 8000, 16000, 20000 };
+            float[] gains = { 0.5f, 0.3f, 0.4f, 0.6f, 0.8f, 1.0f, 1.2f, 1.3f, 1.1f, 0.9f, 0.8f };
+            if (freq <= frequencies[0])
+            {
+                return gains[0];
+            }
+            if (freq >= frequencies[frequencies.Length - 1])
+            {
+                return gains[gains.Length - 1];
+            }
+            int i = 0;
+            while (freq > frequencies[i + 1])
+            {
+                i++;
+            }
+            // 线性插值
+            float x1 = frequencies[i];
+            float y1 = gains[i];
+            float x2 = frequencies[i + 1];
+            float y2 = gains[i + 1];
+            return y1 + (freq - x1) * ((y2 - y1) / (x2 - x1));
+        }
+
+        private void OnRecordingStopped(object? sender, StoppedEventArgs e)
+        {
+        }
+
+        public void Dispose()
+        {
+            if (!_disposed)
+            {
+                _capture?.Dispose();
+                _disposed = true;
+            }
+        }
+    }
+}

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Helper/WindowHelper.cs

@@ -1,12 +1,19 @@
 // 2025/6/23 by Zhe Fang
 
 using BetterLyrics.WinUI3.Enums;
+using BetterLyrics.WinUI3.Services.LiveStatesService;
+using BetterLyrics.WinUI3.Services.MediaSessionsService;
 using BetterLyrics.WinUI3.Views;
+using CommunityToolkit.Mvvm.DependencyInjection;
+using CommunityToolkit.WinUI;
 using Microsoft.UI.Windowing;
 using Microsoft.UI.Xaml;
 using System;
 using System.Collections.Generic;
+using System.Runtime.InteropServices;
+using Vanara.PInvoke;
 using Windows.ApplicationModel.Core;
+using Windows.Foundation;
 using WinRT.Interop;
 using WinUIEx;
 
@@ -15,6 +22,22 @@ namespace BetterLyrics.WinUI3.Helper
     public static class WindowHelper
     {
         private static List<object> _activeWindows = [];
+        private static List<object> _workAreas = [];
+
+        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>();
+
+        public static void HideWindow<T>()
+        {
+            var window = _activeWindows.Find(w => w is T);
+            if (window is Window w)
+            {
+                w.Hide();
+            }
+        }
 
         public static void CloseWindow<T>()
         {
@@ -41,7 +64,8 @@ namespace BetterLyrics.WinUI3.Helper
             }
             return default;
         }
-        public static void OpenWindow<T>()
+
+        public static void OpenOrShowWindow<T>()
         {
             var window = _activeWindows.Find(w => w is T);
             if (window == null)
@@ -63,6 +87,10 @@ namespace BetterLyrics.WinUI3.Helper
                 {
                     window = new LyricsSearchWindow();
                 }
+                else if (typeof(T) == typeof(LyricsWindowSwitchWindow))
+                {
+                    window = new LyricsWindowSwitchWindow();
+                }
                 else
                 {
                     throw new ArgumentException("Unsupported window type", nameof(T));
@@ -74,10 +102,14 @@ namespace BetterLyrics.WinUI3.Helper
 
                 if (typeof(T) == typeof(LyricsWindow))
                 {
+                    var hwnd = WindowNative.GetWindowHandle(castedWindow);
+                    _defaultWindowStyle.Add(hwnd, castedWindow.GetWindowStyle());
+                    _defaultExtendedWindowStyle.Add(hwnd, castedWindow.GetExtendedWindowStyle());
+
                     var lyricsWindow = (LyricsWindow)window;
                     lyricsWindow.ViewModel.InitShortcuts();
-                    lyricsWindow.AutoSelectLyricsMode();
-                    lyricsWindow.ViewModel.SetIsAlwaysOnTop();
+                    lyricsWindow.ViewModel.InitFgWindowWatcher();
+                    lyricsWindow.ViewModel.RefreshLyricsWindowStatus();
                 }
             }
             else
@@ -124,11 +156,7 @@ namespace BetterLyrics.WinUI3.Helper
 
         private static void EnsureDockModeReleased()
         {
-            LyricsWindow? lyricsWindow = GetWindowByWindowType<LyricsWindow>();
-            if (lyricsWindow != null)
-            {
-                DockModeHelper.Disable(lyricsWindow);
-            }
+            SetIsWorkArea<LyricsWindow>(false);
         }
 
         private static void TrackWindow(object window)
@@ -146,7 +174,255 @@ namespace BetterLyrics.WinUI3.Helper
             if (_activeWindows.Contains(sender))
             {
                 _activeWindows.Remove(sender);
+
+                var hwnd = WindowNative.GetWindowHandle(sender);
+                _defaultWindowStyle.Remove(hwnd);
+                _defaultExtendedWindowStyle.Remove(hwnd);
             }
         }
+
+        public static void SetIsClickThrough<T>(bool enable)
+        {
+            Window? window = GetWindowByWindowType<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 = GetWindowByWindowType<T>() as Window;
+            if (window == null) return;
+
+            if (enable)
+            {
+                EnableWorkArea(window);
+            }
+            else
+            {
+                DisableWorkArea(window);
+            }
+        }
+
+        public static void SetIsBorderless<T>(bool enable)
+        {
+            var window = GetWindowByWindowType<T>() as Window;
+            if (window == null) return;
+
+            var hwnd = WindowNative.GetWindowHandle(window);
+
+            if (enable)
+            {
+                window.SetWindowStyle(WindowStyle.Popup | WindowStyle.Visible);
+            }
+            else
+            {
+                window.SetWindowStyle(_defaultWindowStyle[hwnd]);
+            }
+        }
+
+        public static void SetIsShowInSwitchers<T>(bool enable)
+        {
+            var window = GetWindowByWindowType<T>() as Window;
+            if (window == null) return;
+
+            window.AppWindow.IsShownInSwitchers = enable;
+        }
+
+        public static void SetIsAlwaysOnTop<T>(bool enable)
+        {
+            var window = GetWindowByWindowType<T>() as Window;
+            if (window == null) return;
+
+            if (window.AppWindow.Presenter is OverlappedPresenter presenter)
+            {
+                presenter.IsAlwaysOnTop = enable;
+            }
+        }
+
+        public static void MoveAndResize<T>(Rect rect)
+        {
+            var window = GetWindowByWindowType<T>() as Window;
+            if (window == null) return;
+
+            window.AppWindow.MoveAndResize(rect.ToRectInt32());
+        }
+
+        public static void SetTitleBarArea<T>(TitleBarArea titleBarArea)
+        {
+            if (typeof(T) == typeof(LyricsWindow))
+            {
+                LyricsWindow? lyricsWindow = GetWindowByWindowType<LyricsWindow>();
+                lyricsWindow?.SetTitleBarArea(titleBarArea);
+            }
+            else
+            {
+                throw new Exception($"Unsupported window type: {typeof(T).FullName}");
+            }
+        }
+
+        private static void DisableWorkArea(Window window)
+        {
+            IntPtr hwnd = WindowNative.GetWindowHandle(window);
+
+            if (!_workAreas.Contains(hwnd)) return;
+
+            UnregisterWorkArea(hwnd);
+        }
+
+        private static void EnableWorkArea(Window window)
+        {
+            IntPtr hwnd = WindowNative.GetWindowHandle(window);
+
+            if (_workAreas.Contains(hwnd)) return;
+
+            RegisterWorkArea(hwnd);
+
+            double y = _liveStatesService.LiveStates.LyricsWindowStatus.DockPlacement == DockPlacement.Top ?
+                _liveStatesService.LiveStates.LyricsWindowStatus.MonitorBounds.Top :
+                _liveStatesService.LiveStates.LyricsWindowStatus.MonitorBounds.Bottom - _liveStatesService.LiveStates.LyricsWindowStatus.DockHeight;
+
+            y -= 1;
+
+            User32.SetWindowPos(
+                hwnd,
+                IntPtr.Zero,
+                (int)_liveStatesService.LiveStates.LyricsWindowStatus.MonitorBounds.Left,
+                (int)y,
+                (int)_liveStatesService.LiveStates.LyricsWindowStatus.MonitorBounds.Width,
+                (int)_liveStatesService.LiveStates.LyricsWindowStatus.DockHeight + 1,
+                User32.SetWindowPosFlags.SWP_SHOWWINDOW
+            );
+        }
+
+        private static void RegisterWorkArea(IntPtr hwnd)
+        {
+            if (_workAreas.Contains(hwnd)) return;
+
+            var uEdge = _liveStatesService.LiveStates.LyricsWindowStatus.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;
+
+            Shell32.APPBARDATA abd = new()
+            {
+                cbSize = (uint)Marshal.SizeOf<Shell32.APPBARDATA>(),
+                hWnd = hwnd,
+                uEdge = uEdge,
+                rc = new RECT
+                {
+                    Left = (int)_liveStatesService.LiveStates.LyricsWindowStatus.MonitorBounds.Left,
+                    Top = (int)top,
+                    Right = (int)_liveStatesService.LiveStates.LyricsWindowStatus.MonitorBounds.Right,
+                    Bottom = (int)bottom,
+                },
+            };
+
+            Shell32.SHAppBarMessage(Shell32.ABM.ABM_NEW, ref abd);
+            Shell32.SHAppBarMessage(Shell32.ABM.ABM_QUERYPOS, ref abd);
+            Shell32.SHAppBarMessage(Shell32.ABM.ABM_SETPOS, ref abd);
+
+            _workAreas.Add(hwnd);
+        }
+
+        private static void UnregisterWorkArea(IntPtr hwnd)
+        {
+            if (!_workAreas.Contains(hwnd))
+                return;
+
+            Shell32.APPBARDATA abd = new()
+            {
+                cbSize = (uint)Marshal.SizeOf<Shell32.APPBARDATA>(),
+                hWnd = hwnd
+            };
+
+            Shell32.SHAppBarMessage(Shell32.ABM.ABM_REMOVE, ref abd);
+
+            _workAreas.Remove(hwnd);
+        }
+
+        public static void UpdateWorkAreaHeight<T>()
+        {
+            var window = GetWindowByWindowType<T>() as Window;
+            if (window == null) return;
+
+            var hwnd = WindowNative.GetWindowHandle(window);
+
+            App.DispatcherQueueTimer?.Debounce(() =>
+            {
+                if (!_workAreas.Contains(hwnd))
+                    return;
+
+                var uEdge = _liveStatesService.LiveStates.LyricsWindowStatus.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;
+
+                Shell32.APPBARDATA abd = new()
+                {
+                    cbSize = (uint)Marshal.SizeOf<Shell32.APPBARDATA>(),
+                    hWnd = hwnd,
+                    uEdge = uEdge,
+                    rc = new RECT
+                    {
+                        Left = (int)_liveStatesService.LiveStates.LyricsWindowStatus.MonitorBounds.Left,
+                        Top = (int)top,
+                        Right = (int)_liveStatesService.LiveStates.LyricsWindowStatus.MonitorBounds.Right,
+                        Bottom = (int)bottom,
+                    },
+                };
+
+                Shell32.SHAppBarMessage(Shell32.ABM.ABM_QUERYPOS, ref abd);
+                Shell32.SHAppBarMessage(Shell32.ABM.ABM_SETPOS, ref abd);
+
+                // 同步窗口实际高度和位置
+                User32.SetWindowPos(
+                     hwnd,
+                     IntPtr.Zero,
+                     (int)_liveStatesService.LiveStates.LyricsWindowStatus.MonitorBounds.Left,
+                     (int)top - 1,
+                     (int)_liveStatesService.LiveStates.LyricsWindowStatus.MonitorBounds.Width,
+                     (int)_liveStatesService.LiveStates.LyricsWindowStatus.DockHeight + 1,
+                     User32.SetWindowPosFlags.SWP_SHOWWINDOW
+                 );
+
+            }, TimeSpan.FromMilliseconds(100));
+        }
+
+        public static void SetLyricsWindowVisibilityByPlayingStatus()
+        {
+            var window = GetWindowByWindowType<LyricsWindow>();
+            if (window == null) return;
+
+            if (_liveStatesService.LiveStates.LyricsWindowStatus.AutoShowOrHideWindow && !_mediaSessionsService.IsPlaying)
+            {
+                if (_liveStatesService.LiveStates.LyricsWindowStatus.IsWorkArea)
+                {
+                    SetIsWorkArea<LyricsWindow>(false);
+                }
+                HideWindow<LyricsWindow>();
+            }
+            else if (_liveStatesService.LiveStates.LyricsWindowStatus.AutoShowOrHideWindow && _mediaSessionsService.IsPlaying)
+            {
+                if (_liveStatesService.LiveStates.LyricsWindowStatus.IsWorkArea)
+                {
+                    SetIsWorkArea<LyricsWindow>(true);
+                }
+                OpenOrShowWindow<LyricsWindow>();
+            }
+        }
+
     }
 }

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

@@ -1,7 +1,9 @@
 using BetterLyrics.WinUI3.Enums;
 using BetterLyrics.WinUI3.Helper;
 using BetterLyrics.WinUI3.Models.Settings;
+using BetterLyrics.WinUI3.Views;
 using CommunityToolkit.Mvvm.ComponentModel;
+using CommunityToolkit.Mvvm.Messaging;
 using System;
 using System.Collections.Generic;
 using System.Linq;
@@ -14,63 +16,11 @@ namespace BetterLyrics.WinUI3.Models
 {
     public partial class LiveStates : ObservableRecipient
     {
-        [ObservableProperty][NotifyPropertyChangedRecipients] public partial LyricsWindowMode LyricsWindowMode { get; set; }
-        [ObservableProperty][NotifyPropertyChangedRecipients] public partial LyricsDisplayType LyricsDisplayType { get; set; }
-        [ObservableProperty][NotifyPropertyChangedRecipients] public partial bool IsAlwaysOnTop { get; set; }
-        [ObservableProperty][NotifyPropertyChangedRecipients] public partial LyricsStyleSettings LyricsStyleSettings { get; set; }
-        [ObservableProperty][NotifyPropertyChangedRecipients] public partial LyricsEffectSettings LyricsEffectSettings { get; set; }
-        [ObservableProperty][NotifyPropertyChangedRecipients] public partial Rect LyricsWindowBounds { get; set; }
-        [ObservableProperty][NotifyPropertyChangedRecipients] public partial Rect LyricsWindowMonitorBounds { get; set; }
-        [ObservableProperty][NotifyPropertyChangedRecipients] public partial Rect DemoLyricsWindowBounds { get; set; }
-        [ObservableProperty][NotifyPropertyChangedRecipients] public partial Rect DemoLyricsWindowMonitorBounds { get; set; }
-        [ObservableProperty][NotifyPropertyChangedRecipients] public partial string LyricsWindowMonitorName { get; set; }
+        [ObservableProperty][NotifyPropertyChangedRecipients] public partial LyricsWindowStatus LyricsWindowStatus { get; set; }
 
-        public LiveStates(AppSettings appSettings)
+        public LiveStates()
         {
-            LyricsWindowMode = LyricsWindowMode.StandardMode;
-            LyricsDisplayType = appSettings.StandardModeSettings.LyricsDisplayType;
-            LyricsStyleSettings = appSettings.StandardLyricsStyleSettings;
-            LyricsEffectSettings = appSettings.StandardLyricsEffectSettings;
-            IsAlwaysOnTop = false;
-        }
-
-        public void ToggleLyricsWindowMode(LyricsWindowMode mode)
-        {
-            if (LyricsWindowMode == mode)
-            {
-                LyricsWindowMode = LyricsWindowMode.StandardMode;
-            }
-            else
-            {
-                LyricsWindowMode = mode;
-            }
-        }
-
-        partial void OnLyricsWindowBoundsChanged(Rect value)
-        {
-            double factor = 0.1;
-            var lyricsWindow = WindowHelper.GetWindowByWindowType<Views.LyricsWindow>();
-            if (lyricsWindow == null) return;
-            var mointor = MonitorHelper.GetMonitorInfoExFromWindow(lyricsWindow);
-            LyricsWindowMonitorName = mointor.szDevice;
-            LyricsWindowMonitorBounds = new Rect(
-                mointor.rcMonitor.Left,
-                mointor.rcMonitor.Top,
-                mointor.rcMonitor.Width,
-                mointor.rcMonitor.Height
-            );
-            DemoLyricsWindowBounds = new Rect(
-                (value.X - mointor.rcMonitor.Left) * factor,
-                (value.Y - mointor.rcMonitor.Top) * factor,
-                value.Width * factor,
-                value.Height * factor
-            );
-            DemoLyricsWindowMonitorBounds = new Rect(
-                mointor.rcMonitor.Left * factor,
-                mointor.rcMonitor.Top * factor,
-                mointor.rcMonitor.Width * factor,
-                mointor.rcMonitor.Height * factor
-            );
+            LyricsWindowStatus = new LyricsWindowStatus();
         }
     }
 }

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

@@ -0,0 +1,252 @@
+using BetterLyrics.WinUI3.Enums;
+using BetterLyrics.WinUI3.Helper;
+using BetterLyrics.WinUI3.Models.Settings;
+using BetterLyrics.WinUI3.Views;
+using CommunityToolkit.Mvvm.ComponentModel;
+using Microsoft.UI.Windowing;
+using System;
+using Windows.Foundation;
+
+namespace BetterLyrics.WinUI3.Models
+{
+    public partial class LyricsWindowStatus : ObservableRecipient, ICloneable
+    {
+        [ObservableProperty][NotifyPropertyChangedRecipients] public partial string Name { get; set; } = string.Empty;
+        [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 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);
+        [ObservableProperty][NotifyPropertyChangedRecipients] public partial double DockHeight { get; set; } = 64;
+        [ObservableProperty] public partial Rect DemoWindowBounds { get; set; }
+        [ObservableProperty] public partial Rect MonitorBounds { get; set; }
+        [ObservableProperty] public partial Rect DemoMonitorBounds { get; set; }
+        [ObservableProperty][NotifyPropertyChangedRecipients] public partial DockPlacement DockPlacement { get; set; } = DockPlacement.Top;
+        [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 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;
+
+        public LyricsWindowStatus()
+        {
+            UpdateMonitorNameAndBounds();
+            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;
+        }
+
+        private void OldLyricsStyleSettings_PropertyChanged(object? sender, System.ComponentModel.PropertyChangedEventArgs e)
+        {
+            this.OnPropertyChanged(nameof(LyricsStyleSettings));
+        }
+
+        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));
+        }
+
+        partial void OnWindowBoundsChanged(Rect value)
+        {
+            UpdateMonitorNameAndBounds();
+            UpdateDemoWindowAndMonitorBounds();
+        }
+
+        partial void OnAutoShowOrHideWindowChanged(bool value)
+        {
+            WindowHelper.SetLyricsWindowVisibilityByPlayingStatus();
+        }
+
+        public void UpdateMonitorNameAndBounds()
+        {
+            var lyricsWindow = WindowHelper.GetWindowByWindowType<LyricsWindow>();
+            if (lyricsWindow == null) return;
+
+            var mointor = MonitorHelper.GetMonitorInfoExFromWindow(lyricsWindow);
+            MonitorDeviceName = mointor.szDevice;
+            MonitorBounds = new Rect(
+                mointor.rcMonitor.Left,
+                mointor.rcMonitor.Top,
+                mointor.rcMonitor.Width,
+                mointor.rcMonitor.Height
+            );
+        }
+
+        public void UpdateDemoWindowAndMonitorBounds(double factor = 0.1)
+        {
+            DemoWindowBounds = new Rect(
+                (WindowBounds.X - MonitorBounds.Left) * factor,
+                (WindowBounds.Y - MonitorBounds.Top) * factor,
+                WindowBounds.Width * factor,
+                WindowBounds.Height * factor
+            );
+            DemoMonitorBounds = new Rect(
+                MonitorBounds.Left * factor,
+                MonitorBounds.Top * factor,
+                MonitorBounds.Width * factor,
+                MonitorBounds.Height * factor
+            );
+        }
+
+        public object Clone()
+        {
+            return new LyricsWindowStatus
+            {
+                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,
+                LyricsLayoutOrientation = this.LyricsLayoutOrientation,
+                LyricsDisplayType = this.LyricsDisplayType,
+                WindowBounds = this.WindowBounds,
+                DockHeight = this.DockHeight,
+                DemoWindowBounds = this.DemoWindowBounds,
+                MonitorBounds = this.MonitorBounds,
+                DemoMonitorBounds = this.DemoMonitorBounds,
+                LyricsStyleSettings = (LyricsStyleSettings)this.LyricsStyleSettings.Clone(),
+                LyricsEffectSettings = (LyricsEffectSettings)this.LyricsEffectSettings.Clone(),
+                LyricsBackgroundSettings = (LyricsBackgroundSettings)this.LyricsBackgroundSettings.Clone(),
+                AlbumArtLayoutSettings = (AlbumArtLayoutSettings)this.AlbumArtLayoutSettings.Clone(),
+                IsAdaptToEnvironment = this.IsAdaptToEnvironment,
+                EnvironmentSampleMode = this.EnvironmentSampleMode,
+                AutoShowOrHideWindow = this.AutoShowOrHideWindow,
+                TitleBarArea = this.TitleBarArea,
+            };
+        }
+    }
+
+    public static class LyricsWindowStatusExtensions
+    {
+        public static LyricsWindowStatus DesktopMode()
+        {
+            return new LyricsWindowStatus
+            {
+                Name = App.ResourceLoader!.GetString("DesktopMode"),
+                WindowBounds = new Rect(100, 100, 400, 250),
+                IsAlwaysOnTop = true,
+                IsAlwaysOnTopPolling = true,
+                IsBorderless = true,
+                IsAdaptToEnvironment = true,
+                EnvironmentSampleMode = Enums.WindowPixelSampleMode.WindowEdge,
+                LyricsBackgroundSettings = new LyricsBackgroundSettings
+                {
+                    IsPureColorOverlayEnabled = false,
+                    IsCoverOverlayEnabled = false,
+                }
+            };
+        }
+
+        public static LyricsWindowStatus DockedMode()
+        {
+            return new LyricsWindowStatus
+            {
+                Name = App.ResourceLoader!.GetString("DockedMode"),
+                IsWorkArea = true,
+                IsAlwaysOnTop = true,
+                IsAlwaysOnTopPolling = true,
+                IsBorderless = true,
+                IsAdaptToEnvironment = true,
+                LyricsDisplayType = LyricsDisplayType.LyricsOnly,
+                EnvironmentSampleMode = WindowPixelSampleMode.BelowWindow,
+                TitleBarArea = TitleBarArea.None,
+                LyricsStyleSettings = new LyricsStyleSettings
+                {
+                    LyricsAlignmentType = TextAlignmentType.Center,
+                    LyricsFontSize = 18,
+                },
+                LyricsBackgroundSettings = new LyricsBackgroundSettings
+                {
+                    IsCoverOverlayEnabled = false,
+                }
+            };
+        }
+
+        public static LyricsWindowStatus FullscreenMode(Rect monitorBounds)
+        {
+            return new LyricsWindowStatus
+            {
+                Name = App.ResourceLoader!.GetString("FullscreenMode"),
+                WindowBounds = monitorBounds,
+                IsAlwaysOnTop = true,
+                IsBorderless = true,
+                TitleBarArea = Enums.TitleBarArea.None,
+                LyricsLayoutOrientation = Enums.LyricsLayoutOrientation.Vertical,
+                LyricsStyleSettings = new LyricsStyleSettings
+                {
+                    LyricsFontSize = 96,
+                    LyricsAlignmentType = Enums.TextAlignmentType.Center,
+                },
+                AlbumArtLayoutSettings = new AlbumArtLayoutSettings
+                {
+                    AutoAlbumArtSize = false,
+                    AlbumArtSize = 148,
+                    SongInfoFontSize = 48,
+                }
+            };
+        }
+
+        public static LyricsWindowStatus StandardMode()
+        {
+            return new LyricsWindowStatus
+            {
+                Name = App.ResourceLoader!.GetString("StandardMode"),
+            };
+        }
+
+        public static LyricsWindowStatus NarrowMode()
+        {
+            return new LyricsWindowStatus
+            {
+                Name = App.ResourceLoader!.GetString("NarrowMode"),
+                WindowBounds = new Rect(100, 100, 400, 800),
+                LyricsLayoutOrientation = LyricsLayoutOrientation.Vertical,
+            };
+        }
+    }
+}

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

@@ -36,8 +36,9 @@ namespace BetterLyrics.WinUI3.Models
             PositionOffset = 0;
         }
 
-        public MediaSourceProviderInfo(string provider) : base()
+        public MediaSourceProviderInfo(string provider, bool isEnable = true) : base()
         {
+            IsEnabled = isEnable;
             switch (provider)
             {
                 case Constants.PlayerID.AppleMusic:

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/Settings/AlbumArtLayoutSettings.cs

@@ -8,13 +8,32 @@ using System.Threading.Tasks;
 
 namespace BetterLyrics.WinUI3.Models.Settings
 {
-    public partial class AlbumArtLayoutSettings : ObservableRecipient
+    public partial class AlbumArtLayoutSettings : ObservableRecipient, ICloneable
     {
         [ObservableProperty][NotifyPropertyChangedRecipients] public partial TextAlignmentType SongInfoAlignmentType { get; set; } = TextAlignmentType.Left;
         [ObservableProperty][NotifyPropertyChangedRecipients] public partial int CoverImageRadius { get; set; } = 12; // 12 % of the cover image size
         [ObservableProperty][NotifyPropertyChangedRecipients] public partial int CoverImageShadowAmount { get; set; } = 12;
         [ObservableProperty][NotifyPropertyChangedRecipients] public partial int SongInfoFontSize { get; set; } = 18;
+        [ObservableProperty][NotifyPropertyChangedRecipients] public partial bool ShowTitle { get; set; } = true;
+        [ObservableProperty][NotifyPropertyChangedRecipients] public partial bool ShowArtists { get; set; } = true;
+        [ObservableProperty][NotifyPropertyChangedRecipients] public partial int AlbumArtSize { get; set; } = 64;
+        [ObservableProperty][NotifyPropertyChangedRecipients] public partial bool AutoAlbumArtSize { get; set; } = true;
 
         public AlbumArtLayoutSettings() { }
+
+        public object Clone()
+        {
+            return new AlbumArtLayoutSettings
+            {
+                SongInfoAlignmentType = this.SongInfoAlignmentType,
+                CoverImageRadius = this.CoverImageRadius,
+                CoverImageShadowAmount = this.CoverImageShadowAmount,
+                SongInfoFontSize = this.SongInfoFontSize,
+                ShowTitle = this.ShowTitle,
+                ShowArtists = this.ShowArtists,
+                AlbumArtSize = this.AlbumArtSize,
+                AutoAlbumArtSize = this.AutoAlbumArtSize,
+            };
+        }
     }
 }

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/Settings/AppSettings.cs

@@ -10,23 +10,6 @@ namespace BetterLyrics.WinUI3.Models.Settings
     {
         public string Version { get; set; } = Helper.MetadataHelper.AppVersion;
 
-        [ObservableProperty][NotifyPropertyChangedRecipients] public partial LyricsStyleSettings StandardLyricsStyleSettings { get; set; } = new LyricsStyleSettings(32, TextAlignmentType.Left, 0);
-        [ObservableProperty][NotifyPropertyChangedRecipients] public partial LyricsStyleSettings DesktopLyricsStyleSettings { get; set; } = new LyricsStyleSettings(28, TextAlignmentType.Center, 2);
-        [ObservableProperty][NotifyPropertyChangedRecipients] public partial LyricsStyleSettings DockLyricsStyleSettings { get; set; } = new LyricsStyleSettings(16, TextAlignmentType.Center, 0);
-        [ObservableProperty][NotifyPropertyChangedRecipients] public partial LyricsStyleSettings PictureInPictureLyricsStyleSettings { get; set; } = new LyricsStyleSettings(28, TextAlignmentType.Left, 0);
-
-        [ObservableProperty][NotifyPropertyChangedRecipients] public partial LyricsEffectSettings StandardLyricsEffectSettings { get; set; } = new LyricsEffectSettings(100, 500, 1000, EasingType.EaseInOutQuad);
-        [ObservableProperty][NotifyPropertyChangedRecipients] public partial LyricsEffectSettings DesktopLyricsEffectSettings { get; set; } = new LyricsEffectSettings(500, 500, 500, EasingType.EaseInOutQuad);
-        [ObservableProperty][NotifyPropertyChangedRecipients] public partial LyricsEffectSettings DockLyricsEffectSettings { get; set; } = new LyricsEffectSettings(500, 500, 500, EasingType.EaseInOutQuad);
-        [ObservableProperty][NotifyPropertyChangedRecipients] public partial LyricsEffectSettings PictureInPictureLyricsEffectSettings { get; set; } = new LyricsEffectSettings(500, 500, 500, EasingType.EaseInOutQuad);
-
-        [ObservableProperty][NotifyPropertyChangedRecipients] public partial StandardModeSettings StandardModeSettings { get; set; } = new StandardModeSettings();
-        [ObservableProperty][NotifyPropertyChangedRecipients] public partial DesktopModeSettings DesktopModeSettings { get; set; } = new DesktopModeSettings();
-        [ObservableProperty][NotifyPropertyChangedRecipients] public partial DockModeSettings DockModeSettings { get; set; } = new DockModeSettings();
-        [ObservableProperty][NotifyPropertyChangedRecipients] public partial PictureInPictureModeSettings PictureInPictureModeSettings { get; set; } = new PictureInPictureModeSettings();
-
-        [ObservableProperty][NotifyPropertyChangedRecipients] public partial LyricsBackgroundSettings LyricsBackgroundSettings { get; set; } = new LyricsBackgroundSettings();
-        [ObservableProperty][NotifyPropertyChangedRecipients] public partial AlbumArtLayoutSettings AlbumArtLayoutSettings { get; set; } = new AlbumArtLayoutSettings();
         [ObservableProperty][NotifyPropertyChangedRecipients] public partial TranslationSettings TranslationSettings { get; set; } = new TranslationSettings();
         [ObservableProperty][NotifyPropertyChangedRecipients] public partial GeneralSettings GeneralSettings { get; set; } = new GeneralSettings();
         [ObservableProperty][NotifyPropertyChangedRecipients] public partial MusicGallerySettings MusicGallerySettings { get; set; } = new MusicGallerySettings();
@@ -35,7 +18,7 @@ namespace BetterLyrics.WinUI3.Models.Settings
         [ObservableProperty][NotifyPropertyChangedRecipients] public partial FullyObservableCollection<LocalMediaFolder> LocalMediaFolders { get; set; } = [];
         [ObservableProperty][NotifyPropertyChangedRecipients] public partial FullyObservableCollection<MediaSourceProviderInfo> MediaSourceProvidersInfo { get; set; } = [];
         [ObservableProperty][NotifyPropertyChangedRecipients] public partial FullyObservableCollection<MappedSongSearchQuery> MappedSongSearchQueries { get; set; } = [];
-        [ObservableProperty][NotifyPropertyChangedRecipients] public partial FullyObservableCollection<WindowBoundsRecord> WindowBoundsRecords { get; set; } = [];
+        [ObservableProperty][NotifyPropertyChangedRecipients] public partial FullyObservableCollection<LyricsWindowStatus> WindowBoundsRecords { get; set; } = [];
 
         public AppSettings() { }
     }

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/Settings/BaseModeSettings.cs

@@ -10,6 +10,5 @@ namespace BetterLyrics.WinUI3.Models.Settings
 {
     public partial class BaseModeSettings : ObservableRecipient
     {
-        [ObservableProperty][NotifyPropertyChangedRecipients] public partial LyricsDisplayType LyricsDisplayType { get; set; }
     }
 }

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/Settings/DesktopModeSettings.cs

@@ -1,25 +0,0 @@
-using CommunityToolkit.Mvvm.ComponentModel;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using Windows.Foundation;
-using Windows.Graphics;
-
-namespace BetterLyrics.WinUI3.Models.Settings
-{
-    public partial class DesktopModeSettings : BaseModeSettings
-    {
-        [ObservableProperty][NotifyPropertyChangedRecipients] public partial Rect WindowBounds { get; set; } = new Rect(100, 100, 400, 200);
-        [ObservableProperty][NotifyPropertyChangedRecipients] public partial bool AutoLockOnDesktopMode { get; set; } = false;
-        [ObservableProperty][NotifyPropertyChangedRecipients] public partial List<string> LockShortcut { get; set; } = new List<string>() { "Ctrl", "Alt", "U" };
-        [ObservableProperty][NotifyPropertyChangedRecipients] public partial List<string> ToggleShortcut { get; set; } = new List<string>() { "Ctrl", "Alt", "D" };
-        [ObservableProperty][NotifyPropertyChangedRecipients] public partial bool IsAlwaysOnTop { get; set; } = true;
-
-        public DesktopModeSettings()
-        {
-            LyricsDisplayType = Enums.LyricsDisplayType.LyricsOnly;
-        }
-    }
-}

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/Settings/DockModeSettings.cs

@@ -1,24 +0,0 @@
-using BetterLyrics.WinUI3.Enums;
-using BetterLyrics.WinUI3.Helper;
-using CommunityToolkit.Mvvm.ComponentModel;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace BetterLyrics.WinUI3.Models.Settings
-{
-    public partial class DockModeSettings : BaseModeSettings
-    {
-        [ObservableProperty][NotifyPropertyChangedRecipients] public partial DockPlacement DockPlacement { get; set; } = DockPlacement.Top;
-        [ObservableProperty][NotifyPropertyChangedRecipients] public partial int DockWindowHeight { get; set; } = 64;
-        [ObservableProperty][NotifyPropertyChangedRecipients] public partial string DockMonitorDeviceName { get; set; } = MonitorHelper.GetPrimaryMonitorDeviceName();
-        [ObservableProperty][NotifyPropertyChangedRecipients] public partial List<string> ToggleShortcut { get; set; } = new List<string> { "Ctrl", "Shift", "D" };
-
-        public DockModeSettings()
-        {
-            LyricsDisplayType = LyricsDisplayType.LyricsOnly;
-        }
-    }
-}

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

@@ -10,15 +10,15 @@ namespace BetterLyrics.WinUI3.Models.Settings
 {
     public partial class GeneralSettings : ObservableRecipient
     {
-        [ObservableProperty][NotifyPropertyChangedRecipients] public partial LyricsWindowMode AutoStartWindowType { get; set; } = LyricsWindowMode.StandardMode;
         [ObservableProperty][NotifyPropertyChangedRecipients] public partial Language Language { get; set; } = Language.FollowSystem;
-        [ObservableProperty][NotifyPropertyChangedRecipients] public partial bool IgnoreFullscreenWindow { get; set; } = false;
         [ObservableProperty][NotifyPropertyChangedRecipients] public partial string LXMusicServer { get; set; } = string.Empty;
-        [ObservableProperty][NotifyPropertyChangedRecipients] public partial bool HideWindowWhenNotPlaying { get; set; } = true;
         [ObservableProperty][NotifyPropertyChangedRecipients] public partial List<string> ShowOrHideLyricsWindowShortcut { get; set; } = new List<string> { "Ctrl", "Alt", "H" };
-        [ObservableProperty][NotifyPropertyChangedRecipients] public partial bool IsDragEverywhereEnabled { get; set; } = false;
         [ObservableProperty][NotifyPropertyChangedRecipients] public partial bool IsImmersiveMode { get; set; } = false;
-        [ObservableProperty][NotifyPropertyChangedRecipients] public partial bool ExitOnLyricsWindowClosed { get; set; } = true;
+        [ObservableProperty][NotifyPropertyChangedRecipients] public partial bool ExitOnLyricsWindowClosed { get; set; } = false;
+        [ObservableProperty][NotifyPropertyChangedRecipients] public partial bool ListenOnNewPlaybackSource { get; set; } = true;
+        [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" };

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/Settings/LyricsBackgroundSettings.cs

@@ -1,4 +1,5 @@
-using CommunityToolkit.Mvvm.ComponentModel;
+using BetterLyrics.WinUI3.Enums;
+using CommunityToolkit.Mvvm.ComponentModel;
 using Microsoft.UI.Xaml;
 using System;
 using System.Collections.Generic;
@@ -8,15 +9,37 @@ using System.Threading.Tasks;
 
 namespace BetterLyrics.WinUI3.Models.Settings
 {
-    public partial class LyricsBackgroundSettings : ObservableRecipient
+    public partial class LyricsBackgroundSettings : ObservableRecipient, ICloneable
     {
         [ObservableProperty][NotifyPropertyChangedRecipients] public partial ElementTheme LyricsBackgroundTheme { get; set; } = ElementTheme.Dark;
+
+        [ObservableProperty][NotifyPropertyChangedRecipients] public partial bool IsPureColorOverlayEnabled { get; set; } = true;
+        [ObservableProperty][NotifyPropertyChangedRecipients] public partial int PureColorOverlayOpacity { get; set; } = 100; // 100 % = 1.0
+
+        [ObservableProperty][NotifyPropertyChangedRecipients] public partial bool IsCoverOverlayEnabled { get; set; } = true;
         [ObservableProperty][NotifyPropertyChangedRecipients] public partial int CoverOverlayBlurAmount { get; set; } = 100; // 100 % of the cover image size
         [ObservableProperty][NotifyPropertyChangedRecipients] public partial int CoverOverlayOpacity { get; set; } = 100; // 100 % = 1.0
-        [ObservableProperty][NotifyPropertyChangedRecipients] public partial int PureColorOverlayOpacity { get; set; } = 100; // 100 % = 1.0
         [ObservableProperty][NotifyPropertyChangedRecipients] public partial int CoverOverlaySpeed { get; set; } = 50; // 50 % of the base rotate speed
         [ObservableProperty][NotifyPropertyChangedRecipients] public partial int CoverAcrylicEffectAmount { get; set; } = 0;
 
+        [ObservableProperty][NotifyPropertyChangedRecipients] public partial bool IsFluidOverlayEnabled { get; set; } = false;
+        [ObservableProperty][NotifyPropertyChangedRecipients] public partial int FluidOverlayOpacity { get; set; } = 100;
+
+        [ObservableProperty][NotifyPropertyChangedRecipients] public partial bool IsSpectrumOverlayEnabled { get; set; } = false;
+
         public LyricsBackgroundSettings() { }
+
+        public object Clone()
+        {
+            return new LyricsBackgroundSettings
+            {
+                LyricsBackgroundTheme = this.LyricsBackgroundTheme,
+                CoverOverlayBlurAmount = this.CoverOverlayBlurAmount,
+                CoverOverlayOpacity = this.CoverOverlayOpacity,
+                PureColorOverlayOpacity = this.PureColorOverlayOpacity,
+                CoverOverlaySpeed = this.CoverOverlaySpeed,
+                CoverAcrylicEffectAmount = this.CoverAcrylicEffectAmount,
+            };
+        }
     }
 }

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

@@ -8,7 +8,7 @@ using System.Threading.Tasks;
 
 namespace BetterLyrics.WinUI3.Models.Settings
 {
-    public partial class LyricsEffectSettings : ObservableRecipient
+    public partial class LyricsEffectSettings : ObservableRecipient, ICloneable
     {
         [ObservableProperty][NotifyPropertyChangedRecipients] public partial int LyricsBlurAmount { get; set; } = 5;
 
@@ -47,5 +47,29 @@ namespace BetterLyrics.WinUI3.Models.Settings
             LyricsScrollBottomDuration = lyricsScrollBottomDuration;
             LyricsScrollEasingType = lyricsScrollEasingType;
         }
+
+        public object Clone()
+        {
+            return new LyricsEffectSettings(this.LyricsScrollTopDuration, this.LyricsScrollDuration, this.LyricsScrollBottomDuration, this.LyricsScrollEasingType)
+            {
+                LyricsBlurAmount = this.LyricsBlurAmount,
+                IsLyricsLineFadeEnabled = this.IsLyricsLineFadeEnabled,
+                IsLyricsGlowEffectEnabled = this.IsLyricsGlowEffectEnabled,
+                LyricsGlowEffectScope = this.LyricsGlowEffectScope,
+                LyricsGlowEffectAmount = this.LyricsGlowEffectAmount,
+                IsLyricsShadowEnabled = this.IsLyricsShadowEnabled,
+                LyricsShadowScope = this.LyricsShadowScope,
+                LyricsShadowAmount = this.LyricsShadowAmount,
+                LyricsHighlightScope = this.LyricsHighlightScope,
+                LyricsHighlightAmount = this.LyricsHighlightAmount,
+                LyricsTranslationHighlightAmount = this.LyricsTranslationHighlightAmount,
+                IsLyricsFloatAnimationEnabled = this.IsLyricsFloatAnimationEnabled,
+                LyricsFloatAmount = this.LyricsFloatAmount,
+                LyricsScrollTopDelay = this.LyricsScrollTopDelay,
+                LyricsScrollBottomDelay = this.LyricsScrollBottomDelay,
+                LyricsVerticalEdgeOpacity = this.LyricsVerticalEdgeOpacity,
+                IsFanLyricsEnabled = this.IsFanLyricsEnabled
+            };
+        }
     }
 }

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

@@ -11,13 +11,13 @@ using Windows.UI;
 
 namespace BetterLyrics.WinUI3.Models.Settings
 {
-    public partial class LyricsStyleSettings : ObservableRecipient
+    public partial class LyricsStyleSettings : ObservableRecipient, ICloneable
     {
         [ObservableProperty][NotifyPropertyChangedRecipients] public partial bool IsDynamicLyricsFontSize { get; set; } = false;
-        [ObservableProperty][NotifyPropertyChangedRecipients] public partial int LyricsFontSize { get; set; }
-        [ObservableProperty][NotifyPropertyChangedRecipients] public partial TextAlignmentType LyricsAlignmentType { get; set; }
+        [ObservableProperty][NotifyPropertyChangedRecipients] public partial int LyricsFontSize { get; set; } = 24;
+        [ObservableProperty][NotifyPropertyChangedRecipients] public partial TextAlignmentType LyricsAlignmentType { get; set; } = TextAlignmentType.Left;
         [ObservableProperty][NotifyPropertyChangedRecipients] public partial int LyricsBgFontOpacity { get; set; } = 30; // 30% opacity
-        [ObservableProperty][NotifyPropertyChangedRecipients] public partial int LyricsFontStrokeWidth { get; set; }
+        [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;
@@ -37,5 +37,27 @@ namespace BetterLyrics.WinUI3.Models.Settings
             LyricsAlignmentType = lyricsAlignmentType;
             LyricsFontStrokeWidth = lyricsFontStrokeWidth;
         }
+
+        public object Clone()
+        {
+            return new LyricsStyleSettings
+            {
+                IsDynamicLyricsFontSize = this.IsDynamicLyricsFontSize,
+                LyricsFontSize = this.LyricsFontSize,
+                LyricsAlignmentType = this.LyricsAlignmentType,
+                LyricsBgFontOpacity = this.LyricsBgFontOpacity,
+                LyricsFontStrokeWidth = this.LyricsFontStrokeWidth,
+                LyricsCustomBgFontColor = this.LyricsCustomBgFontColor,
+                LyricsCustomFgFontColor = this.LyricsCustomFgFontColor,
+                LyricsCustomStrokeFontColor = this.LyricsCustomStrokeFontColor,
+                LyricsBgFontColorType = this.LyricsBgFontColorType,
+                LyricsFgFontColorType = this.LyricsFgFontColorType,
+                LyricsStrokeFontColorType = this.LyricsStrokeFontColorType,
+                LyricsFontWeight = this.LyricsFontWeight,
+                LyricsLineSpacingFactor = this.LyricsLineSpacingFactor,
+                LyricsTranslationSeparator = this.LyricsTranslationSeparator,
+                LyricsFontFamily = this.LyricsFontFamily
+            };
+        }
     }
 }

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/Settings/PictureInPictureModeSettings.cs

@@ -1,21 +0,0 @@
-using CommunityToolkit.Mvvm.ComponentModel;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using Windows.Foundation;
-
-namespace BetterLyrics.WinUI3.Models.Settings
-{
-    public partial class PictureInPictureModeSettings : BaseModeSettings
-    {
-        [ObservableProperty][NotifyPropertyChangedRecipients] public partial Point WindowPosition { get; set; } = new Point(100, 100);
-        [ObservableProperty][NotifyPropertyChangedRecipients] public partial List<string> ToggleShortcut { get; set; } = new List<string>() { "Ctrl", "Shift", "P" };
-
-        public PictureInPictureModeSettings()
-        {
-            LyricsDisplayType = Enums.LyricsDisplayType.SplitView;
-        }
-    }
-}

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/Settings/StandardModeSettings.cs

@@ -1,24 +0,0 @@
-using BetterLyrics.WinUI3.Enums;
-using CommunityToolkit.Mvvm.ComponentModel;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using Windows.Foundation;
-using Windows.Graphics;
-
-namespace BetterLyrics.WinUI3.Models.Settings
-{
-    public partial class StandardModeSettings : BaseModeSettings
-    {
-        [ObservableProperty][NotifyPropertyChangedRecipients] public partial Rect WindowBounds { get; set; } = new Rect(100, 100, 1000, 600);
-        [ObservableProperty][NotifyPropertyChangedRecipients] public partial bool IsMaximized { get; set; } = false;
-        [ObservableProperty][NotifyPropertyChangedRecipients] public partial bool IsAlwaysOnTop { get; set; } = false;
-
-        public StandardModeSettings()
-        {
-            LyricsDisplayType = LyricsDisplayType.SplitView;
-        }
-    }
-}

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/WindowBoundsRecord.cs

@@ -1,19 +0,0 @@
-using CommunityToolkit.Mvvm.ComponentModel;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using Windows.Foundation;
-
-namespace BetterLyrics.WinUI3.Models
-{
-    public partial class WindowBoundsRecord : ObservableObject
-    {
-        [ObservableProperty] public partial string MonitorDeviceName { get; set; } = string.Empty;
-        [ObservableProperty] public partial Rect WindowBounds { get; set; }
-        [ObservableProperty] public partial Rect DemoWindowBounds { get; set; }
-        [ObservableProperty] public partial Rect MonitorBounds { get; set; }
-        [ObservableProperty] public partial Rect DemoMonitorBounds { get; set; }
-    }
-}

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Renderer/LyricsRenderer.xaml

@@ -14,6 +14,7 @@
     <Grid>
         <canvas:CanvasAnimatedControl
             x:Name="LyricsCanvas"
+            CreateResources="LyricsCanvas_CreateResources"
             Draw="LyricsCanvas_Draw"
             Update="LyricsCanvas_Update" />
     </Grid>

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

@@ -2,7 +2,11 @@
 
 using BetterLyrics.WinUI3.ViewModels.LyricsRendererViewModel;
 using CommunityToolkit.Mvvm.DependencyInjection;
+using CommunityToolkit.WinUI;
+using Microsoft.Graphics.Canvas.Effects;
 using Microsoft.UI.Xaml.Controls;
+using Windows.Storage;
+using Windows.Storage.Streams;
 
 namespace BetterLyrics.WinUI3.Renderer
 {
@@ -31,5 +35,10 @@ namespace BetterLyrics.WinUI3.Renderer
             LyricsCanvas.RemoveFromVisualTree();
             LyricsCanvas = null;
         }
+
+        private async void LyricsCanvas_CreateResources(Microsoft.Graphics.Canvas.UI.Xaml.CanvasAnimatedControl sender, Microsoft.Graphics.Canvas.UI.CanvasCreateResourcesEventArgs args)
+        {
+            await ViewModel.CreateResourcesAsync(sender);
+        }
     }
 }

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

@@ -10,5 +10,6 @@ namespace BetterLyrics.WinUI3.Services.LiveStatesService
     public interface ILiveStatesService
     {
         LiveStates LiveStates { get; set; }
+        void RefreshLyricsWindowStatus();
     }
 }

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

@@ -1,139 +1,101 @@
-using BetterLyrics.WinUI3.Enums;
+using BetterLyrics.WinUI3.Helper;
 using BetterLyrics.WinUI3.Models;
-using BetterLyrics.WinUI3.Models.Settings;
 using BetterLyrics.WinUI3.Services.SettingsService;
 using BetterLyrics.WinUI3.ViewModels;
-using CommunityToolkit.Mvvm.Messaging;
-using CommunityToolkit.Mvvm.Messaging.Messages;
-using System;
-using System.Collections.Generic;
+using BetterLyrics.WinUI3.Views;
 using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace BetterLyrics.WinUI3.Services.LiveStatesService
 {
-    public class LiveStatesService : BaseViewModel, ILiveStatesService,
-        IRecipient<PropertyChangedMessage<LyricsWindowMode>>,
-        IRecipient<PropertyChangedMessage<LyricsDisplayType>>,
-        IRecipient<PropertyChangedMessage<bool>>
+    public partial class LiveStatesService : BaseViewModel, ILiveStatesService
     {
         private readonly ISettingsService _settingsService;
 
-        public LiveStates LiveStates { get; set; }
+        public LiveStates LiveStates { get; set; } = new();
 
         public LiveStatesService(ISettingsService settingsService)
         {
             _settingsService = settingsService;
-
-            LiveStates = new LiveStates(_settingsService.AppSettings);
+            LiveStates.PropertyChanged += LiveStates_PropertyChanged;
+            LiveStates.PropertyChanging += LiveStates_PropertyChanging;
+            InitLyricsWindowStatus();
         }
 
-        public void Receive(PropertyChangedMessage<LyricsWindowMode> message)
+        private void LiveStates_PropertyChanging(object? sender, System.ComponentModel.PropertyChangingEventArgs e)
         {
-            if (message.Sender is LiveStates)
+            if (e.PropertyName == nameof(LiveStates.LyricsWindowStatus))
             {
-                if (message.PropertyName == nameof(LiveStates.LyricsWindowMode))
-                {
-                    switch (message.NewValue)
-                    {
-                        case LyricsWindowMode.StandardMode:
-                            LiveStates.LyricsStyleSettings = _settingsService.AppSettings.StandardLyricsStyleSettings;
-                            LiveStates.LyricsEffectSettings = _settingsService.AppSettings.StandardLyricsEffectSettings;
-                            LiveStates.LyricsDisplayType = _settingsService.AppSettings.StandardModeSettings.LyricsDisplayType;
-                            LiveStates.IsAlwaysOnTop = _settingsService.AppSettings.StandardModeSettings.IsAlwaysOnTop;
-                            break;
-                        case LyricsWindowMode.DockMode:
-                            LiveStates.LyricsStyleSettings = _settingsService.AppSettings.DockLyricsStyleSettings;
-                            LiveStates.LyricsEffectSettings = _settingsService.AppSettings.DockLyricsEffectSettings;
-                            LiveStates.LyricsDisplayType = _settingsService.AppSettings.DockModeSettings.LyricsDisplayType;
-                            LiveStates.IsAlwaysOnTop = true;
-                            break;
-                        case LyricsWindowMode.DesktopMode:
-                            LiveStates.LyricsStyleSettings = _settingsService.AppSettings.DesktopLyricsStyleSettings;
-                            LiveStates.LyricsEffectSettings = _settingsService.AppSettings.DesktopLyricsEffectSettings;
-                            LiveStates.LyricsDisplayType = _settingsService.AppSettings.DesktopModeSettings.LyricsDisplayType;
-                            LiveStates.IsAlwaysOnTop = _settingsService.AppSettings.DesktopModeSettings.IsAlwaysOnTop;
-                            break;
-                        case LyricsWindowMode.PictureInPictureMode:
-                            LiveStates.LyricsStyleSettings = _settingsService.AppSettings.PictureInPictureLyricsStyleSettings;
-                            LiveStates.LyricsEffectSettings = _settingsService.AppSettings.PictureInPictureLyricsEffectSettings;
-                            LiveStates.LyricsDisplayType = _settingsService.AppSettings.PictureInPictureModeSettings.LyricsDisplayType;
-                            // IsAlwaysOnTop 由系统托管
-                            break;
-                        default:
-                            break;
-                    }
-                }
+                LiveStates.LyricsWindowStatus.PropertyChanged -= LyricsWindowStatus_PropertyChanged;
             }
         }
 
-        public void Receive(PropertyChangedMessage<LyricsDisplayType> message)
+        private void LyricsWindowStatus_PropertyChanged(object? sender, System.ComponentModel.PropertyChangedEventArgs e)
         {
-            if (message.Sender is StandardModeSettings)
+            switch (e.PropertyName)
             {
-                if (message.PropertyName == nameof(StandardModeSettings.LyricsDisplayType))
-                {
-                    if (LiveStates.LyricsWindowMode == LyricsWindowMode.StandardMode)
-                    {
-                        LiveStates.LyricsDisplayType = message.NewValue;
-                    }
-                }
-            }
-            else if (message.Sender is DockModeSettings)
-            {
-                if (message.PropertyName == nameof(DockModeSettings.LyricsDisplayType))
-                {
-                    if (LiveStates.LyricsWindowMode == LyricsWindowMode.DockMode)
-                    {
-                        LiveStates.LyricsDisplayType = message.NewValue;
-                    }
-                }
-            }
-            else if (message.Sender is DesktopModeSettings)
-            {
-                if (message.PropertyName == nameof(DesktopModeSettings.LyricsDisplayType))
-                {
-                    if (LiveStates.LyricsWindowMode == LyricsWindowMode.DesktopMode)
-                    {
-                        LiveStates.LyricsDisplayType = message.NewValue;
-                    }
-                }
-            }
-            else if (message.Sender is PictureInPictureModeSettings)
-            {
-                if (message.PropertyName == nameof(PictureInPictureModeSettings.LyricsDisplayType))
-                {
-                    if (LiveStates.LyricsWindowMode == LyricsWindowMode.PictureInPictureMode)
-                    {
-                        LiveStates.LyricsDisplayType = message.NewValue;
-                    }
-                }
+                case nameof(LyricsWindowStatus.DockHeight):
+                case nameof(LyricsWindowStatus.IsWorkArea):
+                case nameof(LyricsWindowStatus.DockPlacement):
+                case nameof(LyricsWindowStatus.MonitorDeviceName):
+                    WindowHelper.UpdateWorkAreaHeight<LyricsWindow>();
+                    break;
+                case nameof(LyricsWindowStatus.IsShownInSwitchers):
+                    WindowHelper.SetIsShowInSwitchers<LyricsWindow>(LiveStates.LyricsWindowStatus.IsShownInSwitchers);
+                    break;
+                case nameof(LyricsWindowStatus.IsAlwaysOnTop):
+                    WindowHelper.SetIsAlwaysOnTop<LyricsWindow>(LiveStates.LyricsWindowStatus.IsAlwaysOnTop);
+                    break;
+                case nameof(LyricsWindowStatus.IsClickThrough):
+                    WindowHelper.SetIsClickThrough<LyricsWindow>(LiveStates.LyricsWindowStatus.IsClickThrough);
+                    break;
+                case nameof(LyricsWindowStatus.IsBorderless):
+                    WindowHelper.SetIsBorderless<LyricsWindow>(LiveStates.LyricsWindowStatus.IsBorderless);
+                    break;
+                case nameof(LyricsWindowStatus.WindowBounds):
+                    WindowHelper.MoveAndResize<LyricsWindow>(LiveStates.LyricsWindowStatus.WindowBounds);
+                    break;
+                case nameof(LyricsWindowStatus.TitleBarArea):
+                    WindowHelper.SetTitleBarArea<LyricsWindow>(LiveStates.LyricsWindowStatus.TitleBarArea);
+                    break;
+                default:
+                    break;
             }
         }
 
-        public void Receive(PropertyChangedMessage<bool> message)
+        private void LiveStates_PropertyChanged(object? sender, System.ComponentModel.PropertyChangedEventArgs e)
         {
-            if (message.Sender is StandardModeSettings)
+            if (e.PropertyName == nameof(LiveStates.LyricsWindowStatus))
             {
-                if (message.PropertyName == nameof(StandardModeSettings.IsAlwaysOnTop))
-                {
-                    if (LiveStates.LyricsWindowMode == LyricsWindowMode.StandardMode)
-                    {
-                        LiveStates.IsAlwaysOnTop = message.NewValue;
-                    }
-                }
+                LiveStates.LyricsWindowStatus.PropertyChanged += LyricsWindowStatus_PropertyChanged;
+                RefreshLyricsWindowStatus();
             }
-            else if (message.Sender is DesktopModeSettings)
+        }
+
+        private void InitLyricsWindowStatus()
+        {
+            var defaultLyricsWindowStatus = _settingsService.AppSettings.WindowBoundsRecords.FirstOrDefault(x => x.IsDefault);
+            if (defaultLyricsWindowStatus == null)
             {
-                if (message.PropertyName == nameof(DesktopModeSettings.IsAlwaysOnTop))
-                {
-                    if (LiveStates.LyricsWindowMode == LyricsWindowMode.DesktopMode)
-                    {
-                        LiveStates.IsAlwaysOnTop = message.NewValue;
-                    }
-                }
+                defaultLyricsWindowStatus = LyricsWindowStatusExtensions.StandardMode();
+                defaultLyricsWindowStatus.IsDefault = true;
+                _settingsService.AppSettings.WindowBoundsRecords.Add(defaultLyricsWindowStatus);
             }
+            LiveStates.LyricsWindowStatus = defaultLyricsWindowStatus;
+        }
+
+        public void RefreshLyricsWindowStatus()
+        {
+            // Order matters!!!
+            WindowHelper.SetIsWorkArea<LyricsWindow>(LiveStates.LyricsWindowStatus.IsWorkArea);
+            WindowHelper.SetIsShowInSwitchers<LyricsWindow>(LiveStates.LyricsWindowStatus.IsShownInSwitchers);
+            WindowHelper.SetIsAlwaysOnTop<LyricsWindow>(LiveStates.LyricsWindowStatus.IsAlwaysOnTop);
+            WindowHelper.SetIsClickThrough<LyricsWindow>(LiveStates.LyricsWindowStatus.IsClickThrough);
+            WindowHelper.SetIsBorderless<LyricsWindow>(LiveStates.LyricsWindowStatus.IsBorderless);
+            WindowHelper.SetLyricsWindowVisibilityByPlayingStatus();
+            WindowHelper.SetTitleBarArea<LyricsWindow>(LiveStates.LyricsWindowStatus.TitleBarArea);
+            WindowHelper.MoveAndResize<LyricsWindow>(LiveStates.LyricsWindowStatus.WindowBounds);
+            LiveStates.LyricsWindowStatus.UpdateMonitorNameAndBounds();
+            LiveStates.LyricsWindowStatus.UpdateDemoWindowAndMonitorBounds();
         }
     }
 }

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

@@ -62,10 +62,10 @@ namespace BetterLyrics.WinUI3.Services.MediaSessionsService
             albumArtSwBitmap = SoftwareBitmap.Copy(albumArtSwBitmap);
             token.ThrowIfCancellationRequested();
 
-            var albumArtLightAccentColor = ImageHelper.GetAccentColorsFromByte(bytes, 1, false).FirstOrDefault();
-            var albumArtDarkAccentColor = ImageHelper.GetAccentColorsFromByte(bytes, 1, true).FirstOrDefault();
+            var albumArtLightAccentColors = ImageHelper.GetAccentColorsFromByte(bytes, 4, false);
+            var albumArtDarkAccentColors = ImageHelper.GetAccentColorsFromByte(bytes, 4, true);
 
-            AlbumArtChanged?.Invoke(this, new AlbumArtChangedEventArgs(null, albumArtSwBitmap, albumArtLightAccentColor, albumArtDarkAccentColor));
+            AlbumArtChanged?.Invoke(this, new AlbumArtChangedEventArgs(null, albumArtSwBitmap, albumArtLightAccentColors, albumArtDarkAccentColors));
         }
     }
 }

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

@@ -105,7 +105,7 @@ namespace BetterLyrics.WinUI3.Services.MediaSessionsService
                     }
                     else
                     {
-                        _lyricsDataArr[0].SetDisplayedTextAlongWith(_lyricsDataArr[found], _liveStatesService.LiveStates.LyricsStyleSettings.LyricsTranslationSeparator, 50);
+                        _lyricsDataArr[0].SetDisplayedTextAlongWith(_lyricsDataArr[found], _liveStatesService.LiveStates.LyricsWindowStatus.LyricsStyleSettings.LyricsTranslationSeparator, 50);
                         _langIndex = 0;
                         TranslationSearchProvider = LyricsSearchProvider.ToTranslationSearchProvider();
                     }
@@ -128,7 +128,7 @@ namespace BetterLyrics.WinUI3.Services.MediaSessionsService
                         }
                         else
                         {
-                            _lyricsDataArr[0].SetDisplayedTextAlongWith(translated, _liveStatesService.LiveStates.LyricsStyleSettings.LyricsTranslationSeparator);
+                            _lyricsDataArr[0].SetDisplayedTextAlongWith(translated, _liveStatesService.LiveStates.LyricsWindowStatus.LyricsStyleSettings.LyricsTranslationSeparator);
                             _langIndex = 0;
                         }
                         TranslationSearchProvider = Enums.TranslationSearchProvider.LibreTranslate;

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

@@ -34,7 +34,7 @@ namespace BetterLyrics.WinUI3.Services.MediaSessionsService
     public partial class MediaSessionsService : BaseViewModel, IMediaSessionsService,
         IRecipient<PropertyChangedMessage<bool>>,
         IRecipient<PropertyChangedMessage<string>>,
-        IRecipient<PropertyChangedMessage<LyricsWindowMode>>,
+        IRecipient<PropertyChangedMessage<LyricsWindowStatus>>,
         IRecipient<PropertyChangedMessage<ChineseRomanization>>,
         IRecipient<PropertyChangedMessage<List<string>>>
     {
@@ -431,7 +431,7 @@ namespace BetterLyrics.WinUI3.Services.MediaSessionsService
                 var found = _settingsService.AppSettings.MediaSourceProvidersInfo.FirstOrDefault(x => x.Provider == id);
                 if (found == null)
                 {
-                    _settingsService.AppSettings.MediaSourceProvidersInfo.Add(new MediaSourceProviderInfo(id));
+                    _settingsService.AppSettings.MediaSourceProvidersInfo.Add(new MediaSourceProviderInfo(id, _settingsService.AppSettings.GeneralSettings.ListenOnNewPlaybackSource));
                 }
             });
         }
@@ -667,11 +667,11 @@ namespace BetterLyrics.WinUI3.Services.MediaSessionsService
 
         }
 
-        public void Receive(PropertyChangedMessage<LyricsWindowMode> message)
+        public void Receive(PropertyChangedMessage<LyricsWindowStatus> message)
         {
             if (message.Sender is LiveStates)
             {
-                if (message.PropertyName == nameof(LiveStates.LyricsWindowMode))
+                if (message.PropertyName == nameof(LiveStates.LyricsWindowStatus))
                 {
                     UpdateTranslations();
                 }

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

@@ -29,23 +29,6 @@ namespace BetterLyrics.WinUI3.Services.SettingsService
 
             AppSettings.PropertyChanged += AppSettings_PropertyChanged;
 
-            AppSettings.StandardModeSettings.PropertyChanged += AppSettings_PropertyChanged;
-            AppSettings.DesktopModeSettings.PropertyChanged += AppSettings_PropertyChanged;
-            AppSettings.DockModeSettings.PropertyChanged += AppSettings_PropertyChanged;
-            AppSettings.PictureInPictureModeSettings.PropertyChanged += AppSettings_PropertyChanged;
-
-            AppSettings.StandardLyricsStyleSettings.PropertyChanged += AppSettings_PropertyChanged;
-            AppSettings.DesktopLyricsStyleSettings.PropertyChanged += AppSettings_PropertyChanged;
-            AppSettings.DockLyricsStyleSettings.PropertyChanged += AppSettings_PropertyChanged;
-            AppSettings.PictureInPictureLyricsStyleSettings.PropertyChanged += AppSettings_PropertyChanged;
-
-            AppSettings.StandardLyricsEffectSettings.PropertyChanged += AppSettings_PropertyChanged;
-            AppSettings.DesktopLyricsEffectSettings.PropertyChanged += AppSettings_PropertyChanged;
-            AppSettings.DockLyricsEffectSettings.PropertyChanged += AppSettings_PropertyChanged;
-            AppSettings.PictureInPictureLyricsEffectSettings.PropertyChanged += AppSettings_PropertyChanged;
-
-            AppSettings.LyricsBackgroundSettings.PropertyChanged += AppSettings_PropertyChanged;
-            AppSettings.AlbumArtLayoutSettings.PropertyChanged += AppSettings_PropertyChanged;
             AppSettings.TranslationSettings.PropertyChanged += AppSettings_PropertyChanged;
             AppSettings.GeneralSettings.PropertyChanged += AppSettings_PropertyChanged;
             AppSettings.MusicGallerySettings.PropertyChanged += AppSettings_PropertyChanged;
@@ -122,10 +105,6 @@ namespace BetterLyrics.WinUI3.Services.SettingsService
         {
             switch (e.PropertyName)
             {
-                case nameof(GeneralSettings.IsDragEverywhereEnabled):
-                    LyricsWindow? lyricsWindow = WindowHelper.GetWindowByWindowType<LyricsWindow>();
-                    lyricsWindow?.UpdateTitleBarArea();
-                    break;
                 case nameof(GeneralSettings.Language):
                     switch (AppSettings.GeneralSettings.Language)
                     {

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

@@ -123,27 +123,12 @@
   <data name="AlbumArtSearchSMTCProvider" xml:space="preserve">
     <value>Music player</value>
   </data>
-  <data name="AllLyricsSettingsControlDesktop.Content" xml:space="preserve">
-    <value>Desktop mode</value>
-  </data>
-  <data name="AllLyricsSettingsControlDock.Content" xml:space="preserve">
-    <value>Dock mode</value>
-  </data>
   <data name="AllLyricsSettingsControlPictureInPicture.Content" xml:space="preserve">
     <value>Picture-in-picture mode</value>
   </data>
-  <data name="AllLyricsSettingsControlStandard.Content" xml:space="preserve">
-    <value>Standard</value>
-  </data>
-  <data name="AppSettingsControlGeneral.Content" xml:space="preserve">
+  <data name="AppSettingsControlGeneral.Text" xml:space="preserve">
     <value>General</value>
   </data>
-  <data name="BaseWindowEnterFullScreenHint" xml:space="preserve">
-    <value>Press Esc to exit full screen mode</value>
-  </data>
-  <data name="BaseWindowFullScreenFlyoutItem.Text" xml:space="preserve">
-    <value>Full screen</value>
-  </data>
   <data name="BaseWindowHostInfoBarCheckBox.Content" xml:space="preserve">
     <value>Do not show this message again</value>
   </data>
@@ -153,32 +138,38 @@
   <data name="Cancel" xml:space="preserve">
     <value>Cancel</value>
   </data>
+  <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>
+  <data name="DockedMode" xml:space="preserve">
+    <value>Docked mode</value>
+  </data>
   <data name="ExportSettingsSuccess" xml:space="preserve">
     <value>Export successful</value>
   </data>
   <data name="FailToStartLXMusicServer" xml:space="preserve">
     <value>Unable to connect to LX Music server, please go to Settings - Advanced options to check if the link is entered correctly</value>
   </data>
+  <data name="FullscreenMode" xml:space="preserve">
+    <value>Fullscreen mode</value>
+  </data>
   <data name="HostWindowClickThroughButton.Content" xml:space="preserve">
     <value>Lock</value>
   </data>
   <data name="HostWindowClickThroughFlyoutItem.Text" xml:space="preserve">
     <value>Lock</value>
   </data>
-  <data name="HostWindowDesktopFlyoutItem.Text" xml:space="preserve">
-    <value>Desktop mode</value>
-  </data>
-  <data name="HostWindowDockFlyoutItem.Text" xml:space="preserve">
-    <value>Dock mode</value>
-  </data>
   <data name="HostWindowLockToolTip.Text" xml:space="preserve">
     <value>Lock</value>
   </data>
-  <data name="HostWindowMoreButtonToolTip.Content" xml:space="preserve">
-    <value>More</value>
+  <data name="HostWindowMusicGalleryButtonToolTip.Content" xml:space="preserve">
+    <value>Music gallery</value>
   </data>
   <data name="HostWindowSettingsFlyoutItem.Text" xml:space="preserve">
     <value>Settings</value>
@@ -223,7 +214,7 @@
     <value>Manually search lyrics</value>
   </data>
   <data name="LyricsPageLyricsSettingsButtonToolTip.Content" xml:space="preserve">
-    <value>Lyrics style and effect quick settings</value>
+    <value>Lyrics Window Management Shortcut Settings</value>
   </data>
   <data name="LyricsPagePlaybackSourceButtonToolTip.Content" xml:space="preserve">
     <value>Play source shortcut settings</value>
@@ -303,11 +294,17 @@
   <data name="LyricsWindowImmersiveButtonToolTip.Content" xml:space="preserve">
     <value>Immersive mode</value>
   </data>
-  <data name="MainPageAlbumArtOnly.Content" xml:space="preserve">
-    <value>Album art only</value>
+  <data name="LyricsWindowSettingsControlCurrentLyricsWindowConfig.Text" xml:space="preserve">
+    <value>Current lyrics window config</value>
   </data>
-  <data name="MainPageDesktopLyricsToggler.ToolTipService.ToolTip" xml:space="preserve">
-    <value>Switch to desktop lyrics mode</value>
+  <data name="LyricsWindowSettingsControlLyricsWindowMode.Header" xml:space="preserve">
+    <value>Lyrics window mode</value>
+  </data>
+  <data name="LyricsWindowSettingsControlSetDefault.Text" xml:space="preserve">
+    <value>Set as default</value>
+  </data>
+  <data name="MainPageAlbumArtOnly.Content" xml:space="preserve">
+    <value>Album art area only</value>
   </data>
   <data name="MainPageEnterImmersiveModeHint" xml:space="preserve">
     <value>Hover back again to show the toggle button</value>
@@ -442,6 +439,12 @@ If you encounter any problems, please go to the Settings page, About tab, and vi
   <data name="MusicGalleryPageTitle" xml:space="preserve">
     <value>Music gallery - BetterLyrics</value>
   </data>
+  <data name="NarrowMode" xml:space="preserve">
+    <value>Narrow mode</value>
+  </data>
+  <data name="PictureInPictureMode" xml:space="preserve">
+    <value>Picture-in-picture mode</value>
+  </data>
   <data name="SetingsPageDonation.Text" xml:space="preserve">
     <value>Donation</value>
   </data>
@@ -460,18 +463,33 @@ If you encounter any problems, please go to the Settings page, About tab, and vi
   <data name="SettingsPageAcrylicThin.Content" xml:space="preserve">
     <value>Acrylic Thin</value>
   </data>
+  <data name="SettingsPageAdaptEnvColor.Description" xml:space="preserve">
+    <value>At the same time, set the pure color layer opacity and the album art layer opacity in the lyrics background to 0 to get the correct effect</value>
+  </data>
+  <data name="SettingsPageAdaptEnvColor.Header" xml:space="preserve">
+    <value>Adapt to environmental color</value>
+  </data>
   <data name="SettingsPageAddFolder.Header" xml:space="preserve">
     <value>Add a folder</value>
   </data>
   <data name="SettingsPageAddFolderButton.Content" xml:space="preserve">
     <value>Add</value>
   </data>
+  <data name="SettingsPageAdvanced.Text" xml:space="preserve">
+    <value>Advanced options</value>
+  </data>
   <data name="SettingsPageAlbumArt.Text" xml:space="preserve">
     <value>Album art</value>
   </data>
+  <data name="SettingsPageAlbumArtLayer.Header" xml:space="preserve">
+    <value>Album art layer</value>
+  </data>
   <data name="SettingsPageAlbumArtSearchProvidersConfig.Text" xml:space="preserve">
     <value>Configure album cover source</value>
   </data>
+  <data name="SettingsPageAlbumArtSize.Header" xml:space="preserve">
+    <value>Album art size</value>
+  </data>
   <data name="SettingsPageAlbumLib.Content" xml:space="preserve">
     <value>Album art source</value>
   </data>
@@ -481,14 +499,14 @@ If you encounter any problems, please go to the Settings page, About tab, and vi
   <data name="SettingsPageAlbumShadowAmount.Header" xml:space="preserve">
     <value>How much the shadows are spreading</value>
   </data>
-  <data name="SettingsPageAlbumStyle.Content" xml:space="preserve">
+  <data name="SettingsPageAlbumStyle.Text" xml:space="preserve">
     <value>Album art area style</value>
   </data>
   <data name="SettingsPageAmount.Header" xml:space="preserve">
     <value>Amount</value>
   </data>
   <data name="SettingsPageAOT.Header" xml:space="preserve">
-    <value>Always on top</value>
+    <value>Bring the lyrics window to the top</value>
   </data>
   <data name="SettingsPageApp.Content" xml:space="preserve">
     <value>App appearance and behavior</value>
@@ -497,29 +515,17 @@ If you encounter any problems, please go to the Settings page, About tab, and vi
     <value>App appearance</value>
   </data>
   <data name="SettingsPageAppBehavior.Text" xml:space="preserve">
-    <value>App behavior</value>
+    <value>General behavior</value>
   </data>
   <data name="SettingsPageApply.Content" xml:space="preserve">
     <value>Apply</value>
   </data>
-  <data name="SettingsPageAutoLock.Header" xml:space="preserve">
-    <value>Auto-lock when activating desktop mode</value>
+  <data name="SettingsPageAutoSize.Header" xml:space="preserve">
+    <value>Automatic resizing</value>
   </data>
   <data name="SettingsPageAutoStart.Header" xml:space="preserve">
     <value>Automatic startup</value>
   </data>
-  <data name="SettingsPageAutoStartDesktopLyrics.Content" xml:space="preserve">
-    <value>Activate desktop mode</value>
-  </data>
-  <data name="SettingsPageAutoStartDockLyrics.Content" xml:space="preserve">
-    <value>Activate dock mode</value>
-  </data>
-  <data name="SettingsPageAutoStartInAppLyrics.Content" xml:space="preserve">
-    <value>Activate standard mode</value>
-  </data>
-  <data name="SettingsPageAutoStartPIPLyrics.Content" xml:space="preserve">
-    <value>Start Picture-in-Picture Mode</value>
-  </data>
   <data name="SettingsPageAutoStartWindow.Header" xml:space="preserve">
     <value>When starting the app</value>
   </data>
@@ -529,9 +535,18 @@ If you encounter any problems, please go to the Settings page, About tab, and vi
   <data name="SettingsPageBackgroundAcrylicEffectAmount.Header" xml:space="preserve">
     <value>Album Background Acrylic Effect Strength</value>
   </data>
-  <data name="SettingsPageBackgroundOverlay.Content" xml:space="preserve">
+  <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>
+  <data name="SettingsPageBorderlessHotKey.Header" xml:space="preserve">
+    <value>Borderless lyrics window shortcut</value>
+  </data>
   <data name="SettingsPageCache.Description" xml:space="preserve">
     <value>Including log files, network lyrics cache</value>
   </data>
@@ -544,9 +559,27 @@ If you encounter any problems, please go to the Settings page, About tab, and vi
   <data name="SettingsPageChinesePreference.Header" xml:space="preserve">
     <value>Convert Chinese to Traditional Chinese</value>
   </data>
+  <data name="SettingsPageClickThrough.Header" xml:space="preserve">
+    <value>Click-through</value>
+  </data>
+  <data name="SettingsPageClickThroughHotKey.Header" xml:space="preserve">
+    <value>Click-through shortcut keys</value>
+  </data>
   <data name="SettingsPageCompactTitleBar.Content" xml:space="preserve">
     <value>Compact</value>
   </data>
+  <data name="SettingsPageConfigName.Description" xml:space="preserve">
+    <value>Naming the recorded window states can help you distinguish them better</value>
+  </data>
+  <data name="SettingsPageConfigName.Header" xml:space="preserve">
+    <value>Configuration name</value>
+  </data>
+  <data name="SettingsPageCreateFromCurrent.Content" xml:space="preserve">
+    <value>Create from the current lyrics window status</value>
+  </data>
+  <data name="SettingsPageCreateFromTemplates.Content" xml:space="preserve">
+    <value>Create from templates</value>
+  </data>
   <data name="SettingsPageCurrentLyricsWindowStatus.Text" xml:space="preserve">
     <value>Current lyrics window status</value>
   </data>
@@ -556,29 +589,29 @@ If you encounter any problems, please go to the Settings page, About tab, and vi
   <data name="SettingsPageDebugOverlay.Header" xml:space="preserve">
     <value>Show debug overlay</value>
   </data>
-  <data name="SettingsPageDelete.Content" xml:space="preserve">
+  <data name="SettingsPageDelete.Text" xml:space="preserve">
     <value>Delete</value>
   </data>
-  <data name="SettingsPageDesktopAcrylic.Content" xml:space="preserve">
-    <value>Desktop Acrylic</value>
+  <data name="SettingsPageDesktopMode.Text" xml:space="preserve">
+    <value>Desktop mode (transparent)</value>
   </data>
-  <data name="SettingsPageDev.Content" xml:space="preserve">
-    <value>Advanced options</value>
-  </data>
-  <data name="SettingsPageDisclaimer.Text" xml:space="preserve">
+  <data name="SettingsPageDisclaimer.Message" xml:space="preserve">
     <value>This project is provided as is without warranty of any kind. All lyrics, fonts, icons, and other third-party resources are the property of their respective copyright holders. The author of this project does not claim ownership of such resources.  This project is non-commercial and should not be used to infringe any rights. Users are responsible for ensuring their own use complies with applicable laws and licenses.</value>
   </data>
   <data name="SettingsPageDiscord.Content" xml:space="preserve">
     <value>Discord</value>
   </data>
   <data name="SettingsPageDisplayTypeSwitcher.Header" xml:space="preserve">
-    <value>Lyrics album layout mode</value>
+    <value>Layout mode</value>
+  </data>
+  <data name="SettingsPageDockedMode.Text" xml:space="preserve">
+    <value>Docked mode</value>
   </data>
   <data name="SettingsPageDockMonitor.Header" xml:space="preserve">
     <value>Target monitor</value>
   </data>
   <data name="SettingsPageDockPlacement.Header" xml:space="preserve">
-    <value>Dock mode placement</value>
+    <value>Work area placement</value>
   </data>
   <data name="SettingsPageDockPlacementBottom.Content" xml:space="preserve">
     <value>Bottom</value>
@@ -589,6 +622,9 @@ If you encounter any problems, please go to the Settings page, About tab, and vi
   <data name="SettingsPageDockWindowHeight.Header" xml:space="preserve">
     <value>Window height</value>
   </data>
+  <data name="SettingsPageDragArea.Header" xml:space="preserve">
+    <value>Draggable area</value>
+  </data>
   <data name="SettingsPageDynamicLyricsFontSize.Header" xml:space="preserve">
     <value>Automatic adjustment</value>
   </data>
@@ -634,6 +670,21 @@ If you encounter any problems, please go to the Settings page, About tab, and vi
   <data name="SettingsPageEN.Content" xml:space="preserve">
     <value>English</value>
   </data>
+  <data name="SettingsPageEnvColorSample.Header" xml:space="preserve">
+    <value>Environmental color sampe mode</value>
+  </data>
+  <data name="SettingsPageEnvColorSampleAbove.Content" xml:space="preserve">
+    <value>Above the window</value>
+  </data>
+  <data name="SettingsPageEnvColorSampleBelow.Content" xml:space="preserve">
+    <value>Below the window</value>
+  </data>
+  <data name="SettingsPageEnvColorSampleEdge.Content" xml:space="preserve">
+    <value>Window edges</value>
+  </data>
+  <data name="SettingsPageEnvColorSampleInner.Content" xml:space="preserve">
+    <value>Inside the window</value>
+  </data>
   <data name="SettingsPageExitOnLyricsWindowClosed.Header" xml:space="preserve">
     <value>Exit the program when you close the lyrics window</value>
   </data>
@@ -652,30 +703,30 @@ If you encounter any problems, please go to the Settings page, About tab, and vi
   <data name="SettingsPageFixedTimeStep.Header" xml:space="preserve">
     <value>Fixed time step rendering</value>
   </data>
+  <data name="SettingsPageFluidLayer.Header" xml:space="preserve">
+    <value>Fluid layer</value>
+  </data>
   <data name="SettingsPageFollowSystem.Content" xml:space="preserve">
     <value>Follow system</value>
   </data>
+  <data name="SettingsPageForceAlwaysOnTop.Description" xml:space="preserve">
+    <value>Keep the lyrics window on top by polling</value>
+  </data>
+  <data name="SettingsPageForceAlwaysOnTop.Header" xml:space="preserve">
+    <value>Force on top</value>
+  </data>
   <data name="SettingsPageFPS.Header" xml:space="preserve">
     <value>Rendering frame rate</value>
   </data>
-  <data name="SettingsPageGlobalDrag.Description" xml:space="preserve">
-    <value>Extend the title bar to the entire page so that the window can be dragged in any non-interactive area</value>
-  </data>
-  <data name="SettingsPageGlobalDrag.Header" xml:space="preserve">
-    <value>Global drag</value>
+  <data name="SettingsPageFullscreenMode.Text" xml:space="preserve">
+    <value>Fullscreen mode</value>
   </data>
   <data name="SettingsPageHideWindow.Description" xml:space="preserve">
-    <value>In docking mode or desktop mode, when no song is playing, the window will be automatically hidden; otherwise, the window will be automatically displayed.</value>
+    <value>Automatically hide/show lyric window when music is not playing</value>
   </data>
   <data name="SettingsPageHideWindow.Header" xml:space="preserve">
     <value>Automatically hide/show windows</value>
   </data>
-  <data name="SettingsPageIgnoreFullscreenWindow.Description" xml:space="preserve">
-    <value>Force this app to appear on top of full-screen apps when docked or desktop mode is enabled</value>
-  </data>
-  <data name="SettingsPageIgnoreFullscreenWindow.Header" xml:space="preserve">
-    <value>Always stay on top of fullscreen applications</value>
-  </data>
   <data name="SettingsPageImportSettingsButton.Content" xml:space="preserve">
     <value>Import settings</value>
   </data>
@@ -727,14 +778,23 @@ If you encounter any problems, please go to the Settings page, About tab, and vi
   <data name="SettingsPageLastFMUsername.Header" xml:space="preserve">
     <value>Username</value>
   </data>
+  <data name="SettingsPageLayoutOrientation.Header" xml:space="preserve">
+    <value>Layout orientation</value>
+  </data>
+  <data name="SettingsPageLayoutOrientationHorizontal.Content" xml:space="preserve">
+    <value>Horizontal</value>
+  </data>
+  <data name="SettingsPageLayoutOrientationVertical.Content" xml:space="preserve">
+    <value>Vertical</value>
+  </data>
   <data name="SettingsPageLibreTranslateServer.Header" xml:space="preserve">
     <value>Server address</value>
   </data>
   <data name="SettingsPageLight.Content" xml:space="preserve">
     <value>Light</value>
   </data>
-  <data name="SettingsPageLockHotKey.Header" xml:space="preserve">
-    <value>Unlock and lock shortcut keys</value>
+  <data name="SettingsPageListenNewSession.Header" xml:space="preserve">
+    <value>Enable monitoring for new playback sources</value>
   </data>
   <data name="SettingsPageLog.Header" xml:space="preserve">
     <value>Log record</value>
@@ -742,7 +802,7 @@ If you encounter any problems, please go to the Settings page, About tab, and vi
   <data name="SettingsPageLXMusicServer.Text" xml:space="preserve">
     <value>LX Music Server</value>
   </data>
-  <data name="SettingsPageLyrics.Content" xml:space="preserve">
+  <data name="SettingsPageLyrics.Text" xml:space="preserve">
     <value>Lyrics style and effect</value>
   </data>
   <data name="SettingsPageLyricsAlignment.Header" xml:space="preserve">
@@ -751,15 +811,6 @@ If you encounter any problems, please go to the Settings page, About tab, and vi
   <data name="SettingsPageLyricsBackground.Header" xml:space="preserve">
     <value>Lyrics background</value>
   </data>
-  <data name="SettingsPageLyricsBackgroundBlurAmount.Header" xml:space="preserve">
-    <value>Album background layer ambiguity</value>
-  </data>
-  <data name="SettingsPageLyricsBackgroundOpacity.Header" xml:space="preserve">
-    <value>Album background layer opacity</value>
-  </data>
-  <data name="SettingsPageLyricsBackgroundSpeed.Header" xml:space="preserve">
-    <value>Album Background Layer Motion Rate</value>
-  </data>
   <data name="SettingsPageLyricsBgFontColor.Header" xml:space="preserve">
     <value>Font color (Non-current playback area)</value>
   </data>
@@ -859,9 +910,6 @@ If you encounter any problems, please go to the Settings page, About tab, and vi
   <data name="SettingsPageLyricsNormal.Content" xml:space="preserve">
     <value>Normal</value>
   </data>
-  <data name="SettingsPageLyricsPureColorBgOpacity.Header" xml:space="preserve">
-    <value>Solid background layer opacity</value>
-  </data>
   <data name="SettingsPageLyricsRendingScopeCurrentChar.Content" xml:space="preserve">
     <value>Current char</value>
   </data>
@@ -913,9 +961,15 @@ If you encounter any problems, please go to the Settings page, About tab, and vi
   <data name="SettingsPageLyricsVerticalEdgeOpacity.Header" xml:space="preserve">
     <value>Top and bottom edge opacity</value>
   </data>
-  <data name="SettingsPageLyricsWindowManager.Header" xml:space="preserve">
+  <data name="SettingsPageLyricsWindowManager.Text" xml:space="preserve">
     <value>Lyrics window manager</value>
   </data>
+  <data name="SettingsPageLyricsWindowMgr.Content" xml:space="preserve">
+    <value>Lyrics window manager</value>
+  </data>
+  <data name="SettingsPageLyricsWindowSwitchHotKey.Header" xml:space="preserve">
+    <value>Lyrics window status switcher shortcut</value>
+  </data>
   <data name="SettingsPageMediaLib.Content" xml:space="preserve">
     <value>Media library</value>
   </data>
@@ -940,13 +994,19 @@ If you encounter any problems, please go to the Settings page, About tab, and vi
   <data name="SettingsPageMusicLibRealTimeWatch.Header" xml:space="preserve">
     <value>Listen to file changes in real time</value>
   </data>
+  <data name="SettingsPageNarrowMode.Text" xml:space="preserve">
+    <value>Narrow mode</value>
+  </data>
   <data name="SettingsPageNextSongHotKey.Header" xml:space="preserve">
     <value>Next track shortcut keys</value>
   </data>
   <data name="SettingsPageNoBackdrop.Content" xml:space="preserve">
     <value>None</value>
   </data>
-  <data name="SettingsPageOpenLogFolderButton.Content" xml:space="preserve">
+  <data name="SettingsPageOpacity.Header" xml:space="preserve">
+    <value>Opacity</value>
+  </data>
+  <data name="SettingsPageOpenFolderButton.Content" xml:space="preserve">
     <value>Open in file explorer</value>
   </data>
   <data name="SettingsPagePathBeIncludedInfo" xml:space="preserve">
@@ -982,9 +1042,15 @@ If you encounter any problems, please go to the Settings page, About tab, and vi
   <data name="SettingsPagePreviousSongHotKey.Header" xml:space="preserve">
     <value>Shortcut keys for the previous track</value>
   </data>
+  <data name="SettingsPagePureLayer.Header" xml:space="preserve">
+    <value>Pure color layer</value>
+  </data>
   <data name="SettingsPageQQGroup.Content" xml:space="preserve">
     <value>QQ feedback &amp; chat group</value>
   </data>
+  <data name="SettingsPageRealtimeStatus.Text" xml:space="preserve">
+    <value>Realtime status</value>
+  </data>
   <data name="SettingsPageRecord.Content" xml:space="preserve">
     <value>Record</value>
   </data>
@@ -1039,6 +1105,9 @@ If you encounter any problems, please go to the Settings page, About tab, and vi
   <data name="SettingsPageServerTestSuccessInfo" xml:space="preserve">
     <value>Server test successful</value>
   </data>
+  <data name="SettingsPageSettings.Header" xml:space="preserve">
+    <value>Settings</value>
+  </data>
   <data name="SettingsPageSettingsManager.Header" xml:space="preserve">
     <value>Settings manager</value>
   </data>
@@ -1048,9 +1117,21 @@ If you encounter any problems, please go to the Settings page, About tab, and vi
   <data name="SettingsPageShortcutRegSuccessInfo" xml:space="preserve">
     <value>This hotkey has been successfully registered</value>
   </data>
+  <data name="SettingsPageShowArtists.Header" xml:space="preserve">
+    <value>Show artists</value>
+  </data>
   <data name="SettingsPageShowHideHotKey.Header" xml:space="preserve">
     <value>Lyrics window display and hide shortcut keys</value>
   </data>
+  <data name="SettingsPageShowInSwitchers.Description" xml:space="preserve">
+    <value>e.g. Alt + Tab, Taskbar</value>
+  </data>
+  <data name="SettingsPageShowInSwitchers.Header" xml:space="preserve">
+    <value>Show in system environment</value>
+  </data>
+  <data name="SettingsPageShowTitle.Header" xml:space="preserve">
+    <value>Show title</value>
+  </data>
   <data name="SettingsPageSliderPrefix.Text" xml:space="preserve">
     <value>Current value: </value>
   </data>
@@ -1069,6 +1150,15 @@ If you encounter any problems, please go to the Settings page, About tab, and vi
   <data name="SettingsPageSongInfoRight.Content" xml:space="preserve">
     <value>Right</value>
   </data>
+  <data name="SettingsPageSpectrumLayer.Header" xml:space="preserve">
+    <value>Spectrum layer</value>
+  </data>
+  <data name="SettingsPageSpeed.Header" xml:space="preserve">
+    <value>Motion rate</value>
+  </data>
+  <data name="SettingsPageStandardMode.Text" xml:space="preserve">
+    <value>Standard mode</value>
+  </data>
   <data name="SettingsPageSystemLanguage.Content" xml:space="preserve">
     <value>Default</value>
   </data>
@@ -1087,6 +1177,15 @@ If you encounter any problems, please go to the Settings page, About tab, and vi
   <data name="SettingsPageTitle" xml:space="preserve">
     <value>Settings - BetterLyrics</value>
   </data>
+  <data name="SettingsPageTitleBarAreaNone.Content" xml:space="preserve">
+    <value>None</value>
+  </data>
+  <data name="SettingsPageTitleBarAreaTop.Content" xml:space="preserve">
+    <value>Top</value>
+  </data>
+  <data name="SettingsPageTitleBarAreaWhole.Content" xml:space="preserve">
+    <value>The whole window</value>
+  </data>
   <data name="SettingsPageTitleBarType.Header" xml:space="preserve">
     <value>Title bar size</value>
   </data>
@@ -1108,6 +1207,18 @@ If you encounter any problems, please go to the Settings page, About tab, and vi
   <data name="SettingsPageVersion.Text" xml:space="preserve">
     <value>Version</value>
   </data>
+  <data name="SettingsPageWorkArea.Description" xml:space="preserve">
+    <value>As a separate work area docked to the upper/lower edge of the screen</value>
+  </data>
+  <data name="SettingsPageWorkArea.Header" xml:space="preserve">
+    <value>As work area</value>
+  </data>
+  <data name="SettingsPageWorkAreaHeight.Header" xml:space="preserve">
+    <value>Work area height</value>
+  </data>
+  <data name="StandardMode" xml:space="preserve">
+    <value>Standard mode</value>
+  </data>
   <data name="SystemTrayExit.Text" xml:space="preserve">
     <value>Exit</value>
   </data>
@@ -1129,9 +1240,6 @@ If you encounter any problems, please go to the Settings page, About tab, and vi
   <data name="SystemTraySettings.Text" xml:space="preserve">
     <value>Settings</value>
   </data>
-  <data name="SystemTrayUnlock.Text" xml:space="preserve">
-    <value>Unlock the window</value>
-  </data>
   <data name="TranslateServerNotSet" xml:space="preserve">
     <value>Translate server is not set, please configure it in settings first</value>
   </data>

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

@@ -123,27 +123,12 @@
   <data name="AlbumArtSearchSMTCProvider" xml:space="preserve">
     <value>音楽プレーヤー</value>
   </data>
-  <data name="AllLyricsSettingsControlDesktop.Content" xml:space="preserve">
-    <value>デスクトップモード</value>
-  </data>
-  <data name="AllLyricsSettingsControlDock.Content" xml:space="preserve">
-    <value>ドックモード</value>
-  </data>
   <data name="AllLyricsSettingsControlPictureInPicture.Content" xml:space="preserve">
     <value>ピクチャーインピクチャーモード</value>
   </data>
-  <data name="AllLyricsSettingsControlStandard.Content" xml:space="preserve">
-    <value>標準モード</value>
-  </data>
-  <data name="AppSettingsControlGeneral.Content" xml:space="preserve">
+  <data name="AppSettingsControlGeneral.Text" xml:space="preserve">
     <value>一般的な</value>
   </data>
-  <data name="BaseWindowEnterFullScreenHint" xml:space="preserve">
-    <value>ESCを押して、フルスクリーンモードを終了します</value>
-  </data>
-  <data name="BaseWindowFullScreenFlyoutItem.Text" xml:space="preserve">
-    <value>全画面表示</value>
-  </data>
   <data name="BaseWindowHostInfoBarCheckBox.Content" xml:space="preserve">
     <value>このメッセージを二度と見せないでください</value>
   </data>
@@ -153,32 +138,38 @@
   <data name="Cancel" xml:space="preserve">
     <value>キャンセル</value>
   </data>
+  <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>
+  <data name="DockedMode" xml:space="preserve">
+    <value>ドック式</value>
+  </data>
   <data name="ExportSettingsSuccess" xml:space="preserve">
     <value>エクスポートが成功しました</value>
   </data>
   <data name="FailToStartLXMusicServer" xml:space="preserve">
     <value>LX Music Serverに接続できない場合は、設定に移動してください。リンクが正しく入力されているかどうかを確認するための高度なオプションに移動してください</value>
   </data>
+  <data name="FullscreenMode" xml:space="preserve">
+    <value>フルスクリーンモード</value>
+  </data>
   <data name="HostWindowClickThroughButton.Content" xml:space="preserve">
     <value>ロック</value>
   </data>
   <data name="HostWindowClickThroughFlyoutItem.Text" xml:space="preserve">
     <value>ロック</value>
   </data>
-  <data name="HostWindowDesktopFlyoutItem.Text" xml:space="preserve">
-    <value>デスクトップモード</value>
-  </data>
-  <data name="HostWindowDockFlyoutItem.Text" xml:space="preserve">
-    <value>ドックモード</value>
-  </data>
   <data name="HostWindowLockToolTip.Text" xml:space="preserve">
     <value>ロック</value>
   </data>
-  <data name="HostWindowMoreButtonToolTip.Content" xml:space="preserve">
-    <value>もっと</value>
+  <data name="HostWindowMusicGalleryButtonToolTip.Content" xml:space="preserve">
+    <value>ミュージックギャラリー</value>
   </data>
   <data name="HostWindowSettingsFlyoutItem.Text" xml:space="preserve">
     <value>設定</value>
@@ -223,7 +214,7 @@
     <value>手動で歌詞を検索します</value>
   </data>
   <data name="LyricsPageLyricsSettingsButtonToolTip.Content" xml:space="preserve">
-    <value>歌詞スタイルと効果クイック設定</value>
+    <value>歌詞ウィンドウ管理ショートカット設定</value>
   </data>
   <data name="LyricsPagePlaybackSourceButtonToolTip.Content" xml:space="preserve">
     <value>再生ソースクイック設定</value>
@@ -303,11 +294,17 @@
   <data name="LyricsWindowImmersiveButtonToolTip.Content" xml:space="preserve">
     <value>没入モード</value>
   </data>
-  <data name="MainPageAlbumArtOnly.Content" xml:space="preserve">
-    <value>アルバムアートのみ</value>
+  <data name="LyricsWindowSettingsControlCurrentLyricsWindowConfig.Text" xml:space="preserve">
+    <value>現在の歌詞ウィンドウ設定</value>
   </data>
-  <data name="MainPageDesktopLyricsToggler.ToolTipService.ToolTip" xml:space="preserve">
-    <value>デスクトップ歌詞モードに切り替えます</value>
+  <data name="LyricsWindowSettingsControlLyricsWindowMode.Header" xml:space="preserve">
+    <value>歌詞ウィンドウモード</value>
+  </data>
+  <data name="LyricsWindowSettingsControlSetDefault.Text" xml:space="preserve">
+    <value>既定のブラウザーに設定する</value>
+  </data>
+  <data name="MainPageAlbumArtOnly.Content" xml:space="preserve">
+    <value>アルバムアートエリアのみ</value>
   </data>
   <data name="MainPageEnterImmersiveModeHint" xml:space="preserve">
     <value>再びホバリングして、トグルボタンを表示します</value>
@@ -442,6 +439,12 @@
   <data name="MusicGalleryPageTitle" xml:space="preserve">
     <value>音楽ギャラリー - BetterLyrics</value>
   </data>
+  <data name="NarrowMode" xml:space="preserve">
+    <value>狭い</value>
+  </data>
+  <data name="PictureInPictureMode" xml:space="preserve">
+    <value>ピクチャーインピクチャーモード</value>
+  </data>
   <data name="SetingsPageDonation.Text" xml:space="preserve">
     <value>寄付</value>
   </data>
@@ -460,18 +463,33 @@
   <data name="SettingsPageAcrylicThin.Content" xml:space="preserve">
     <value>アクリル薄い</value>
   </data>
+  <data name="SettingsPageAdaptEnvColor.Description" xml:space="preserve">
+    <value>同時に、歌詞の背景のピュアカラーレイヤーの不透明度とアルバムアートレイヤーの不透明度を0に設定して、正しい効果を得ます</value>
+  </data>
+  <data name="SettingsPageAdaptEnvColor.Header" xml:space="preserve">
+    <value>環境の色に適応しましょう</value>
+  </data>
   <data name="SettingsPageAddFolder.Header" xml:space="preserve">
     <value>フォルダーを追加します</value>
   </data>
   <data name="SettingsPageAddFolderButton.Content" xml:space="preserve">
     <value>追加</value>
   </data>
+  <data name="SettingsPageAdvanced.Text" xml:space="preserve">
+    <value>高度なオプション</value>
+  </data>
   <data name="SettingsPageAlbumArt.Text" xml:space="preserve">
     <value>アルバムアート</value>
   </data>
+  <data name="SettingsPageAlbumArtLayer.Header" xml:space="preserve">
+    <value>アルバムアートレイヤー</value>
+  </data>
   <data name="SettingsPageAlbumArtSearchProvidersConfig.Text" xml:space="preserve">
     <value>アルバムカバーソースを構成します</value>
   </data>
+  <data name="SettingsPageAlbumArtSize.Header" xml:space="preserve">
+    <value>アルバムアートサイズ</value>
+  </data>
   <data name="SettingsPageAlbumLib.Content" xml:space="preserve">
     <value>アルバムアートソース</value>
   </data>
@@ -481,14 +499,14 @@
   <data name="SettingsPageAlbumShadowAmount.Header" xml:space="preserve">
     <value>影がどれだけ広がっているか</value>
   </data>
-  <data name="SettingsPageAlbumStyle.Content" xml:space="preserve">
+  <data name="SettingsPageAlbumStyle.Text" xml:space="preserve">
     <value>アルバムエリアスタイル</value>
   </data>
   <data name="SettingsPageAmount.Header" xml:space="preserve">
     <value>量</value>
   </data>
   <data name="SettingsPageAOT.Header" xml:space="preserve">
-    <value>常にトップ</value>
+    <value>歌詞ウィンドウを一番上に表示します</value>
   </data>
   <data name="SettingsPageApp.Content" xml:space="preserve">
     <value>アプリの外観と動作</value>
@@ -497,29 +515,17 @@
     <value>アプリの外観</value>
   </data>
   <data name="SettingsPageAppBehavior.Text" xml:space="preserve">
-    <value>アプリの動作</value>
+    <value>一般的な行動</value>
   </data>
   <data name="SettingsPageApply.Content" xml:space="preserve">
     <value>適用する</value>
   </data>
-  <data name="SettingsPageAutoLock.Header" xml:space="preserve">
-    <value>デスクトップモードをアクティブにするときの自動ロック</value>
+  <data name="SettingsPageAutoSize.Header" xml:space="preserve">
+    <value>自動サイズ変更</value>
   </data>
   <data name="SettingsPageAutoStart.Header" xml:space="preserve">
     <value>自動起動</value>
   </data>
-  <data name="SettingsPageAutoStartDesktopLyrics.Content" xml:space="preserve">
-    <value>デスクトップモードを開始します</value>
-  </data>
-  <data name="SettingsPageAutoStartDockLyrics.Content" xml:space="preserve">
-    <value>ドックモードをアクティブにします</value>
-  </data>
-  <data name="SettingsPageAutoStartInAppLyrics.Content" xml:space="preserve">
-    <value>標準モードをアクティブにします</value>
-  </data>
-  <data name="SettingsPageAutoStartPIPLyrics.Content" xml:space="preserve">
-    <value>ピクチャーインピクチャーモードを開始します</value>
-  </data>
   <data name="SettingsPageAutoStartWindow.Header" xml:space="preserve">
     <value>アプリを起動するとき</value>
   </data>
@@ -529,9 +535,18 @@
   <data name="SettingsPageBackgroundAcrylicEffectAmount.Header" xml:space="preserve">
     <value>アルバムの背景アクリル効果の強さ</value>
   </data>
-  <data name="SettingsPageBackgroundOverlay.Content" xml:space="preserve">
+  <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>
+  <data name="SettingsPageBorderlessHotKey.Header" xml:space="preserve">
+    <value>ボーダーレス歌詞ウィンドウショートカット</value>
+  </data>
   <data name="SettingsPageCache.Description" xml:space="preserve">
     <value>ログファイル、ネットワーク歌詞キャッシュを含む</value>
   </data>
@@ -544,9 +559,27 @@
   <data name="SettingsPageChinesePreference.Header" xml:space="preserve">
     <value>中国人を伝統的な中国人に変換します</value>
   </data>
+  <data name="SettingsPageClickThrough.Header" xml:space="preserve">
+    <value>クリックスルー</value>
+  </data>
+  <data name="SettingsPageClickThroughHotKey.Header" xml:space="preserve">
+    <value>クリックスルーショートカットキー</value>
+  </data>
   <data name="SettingsPageCompactTitleBar.Content" xml:space="preserve">
     <value>コンパクト</value>
   </data>
+  <data name="SettingsPageConfigName.Description" xml:space="preserve">
+    <value>記録されたウィンドウの状態に名前を付けると、それらをよりよく区別するのに役立ちます</value>
+  </data>
+  <data name="SettingsPageConfigName.Header" xml:space="preserve">
+    <value>設定名</value>
+  </data>
+  <data name="SettingsPageCreateFromCurrent.Content" xml:space="preserve">
+    <value>現在の歌詞ウィンドウのステータスから作成</value>
+  </data>
+  <data name="SettingsPageCreateFromTemplates.Content" xml:space="preserve">
+    <value>テンプレートから作成</value>
+  </data>
   <data name="SettingsPageCurrentLyricsWindowStatus.Text" xml:space="preserve">
     <value>現在の歌詞ウィンドウステータス</value>
   </data>
@@ -556,29 +589,29 @@
   <data name="SettingsPageDebugOverlay.Header" xml:space="preserve">
     <value>デバッグオーバーレイを表示します</value>
   </data>
-  <data name="SettingsPageDelete.Content" xml:space="preserve">
+  <data name="SettingsPageDelete.Text" xml:space="preserve">
     <value>消去</value>
   </data>
-  <data name="SettingsPageDesktopAcrylic.Content" xml:space="preserve">
-    <value>デスクトップアクリル</value>
+  <data name="SettingsPageDesktopMode.Text" xml:space="preserve">
+    <value>デスクトップモード（透明） </value>
   </data>
-  <data name="SettingsPageDev.Content" xml:space="preserve">
-    <value>高度なオプション</value>
-  </data>
-  <data name="SettingsPageDisclaimer.Text" xml:space="preserve">
+  <data name="SettingsPageDisclaimer.Message" xml:space="preserve">
     <value>このプロジェクトは、いかなる種類の保証もなく現状のまま提供されています。すべての歌詞、フォント、アイコン、およびその他のサードパーティのリソースは、それぞれの著作権所有者の財産です。このプロジェクトの作成者は、そのようなリソースの所有権を主張していません。このプロジェクトは非営利的であり、いかなる権利も侵害するために使用すべきではありません。ユーザーは、自らの使用が適用される法律およびライセンスに準拠していることを確認する責任があります。</value>
   </data>
   <data name="SettingsPageDiscord.Content" xml:space="preserve">
     <value>Discord</value>
   </data>
   <data name="SettingsPageDisplayTypeSwitcher.Header" xml:space="preserve">
-    <value>歌詞アルバムレイアウトモード</value>
+    <value>レイアウトモード</value>
+  </data>
+  <data name="SettingsPageDockedMode.Text" xml:space="preserve">
+    <value>ドック式</value>
   </data>
   <data name="SettingsPageDockMonitor.Header" xml:space="preserve">
     <value>ターゲットモニター</value>
   </data>
   <data name="SettingsPageDockPlacement.Header" xml:space="preserve">
-    <value>ドックモード配置</value>
+    <value>作業エリアの配置</value>
   </data>
   <data name="SettingsPageDockPlacementBottom.Content" xml:space="preserve">
     <value>底</value>
@@ -589,6 +622,9 @@
   <data name="SettingsPageDockWindowHeight.Header" xml:space="preserve">
     <value>窓の高さ</value>
   </data>
+  <data name="SettingsPageDragArea.Header" xml:space="preserve">
+    <value>ドラッグ可能</value>
+  </data>
   <data name="SettingsPageDynamicLyricsFontSize.Header" xml:space="preserve">
     <value>自動調整</value>
   </data>
@@ -634,6 +670,21 @@
   <data name="SettingsPageEN.Content" xml:space="preserve">
     <value>English</value>
   </data>
+  <data name="SettingsPageEnvColorSample.Header" xml:space="preserve">
+    <value>環境カラーサンプモード</value>
+  </data>
+  <data name="SettingsPageEnvColorSampleAbove.Content" xml:space="preserve">
+    <value>窓の上</value>
+  </data>
+  <data name="SettingsPageEnvColorSampleBelow.Content" xml:space="preserve">
+    <value>窓の下</value>
+  </data>
+  <data name="SettingsPageEnvColorSampleEdge.Content" xml:space="preserve">
+    <value>ウィンドウエッジ</value>
+  </data>
+  <data name="SettingsPageEnvColorSampleInner.Content" xml:space="preserve">
+    <value>窓の中だ</value>
+  </data>
   <data name="SettingsPageExitOnLyricsWindowClosed.Header" xml:space="preserve">
     <value>歌詞ウィンドウを閉じてプログラムを終了してください</value>
   </data>
@@ -652,30 +703,30 @@
   <data name="SettingsPageFixedTimeStep.Header" xml:space="preserve">
     <value>固定時間ステップレンダリング</value>
   </data>
+  <data name="SettingsPageFluidLayer.Header" xml:space="preserve">
+    <value>流体層</value>
+  </data>
   <data name="SettingsPageFollowSystem.Content" xml:space="preserve">
     <value>システムをフォローします</value>
   </data>
+  <data name="SettingsPageForceAlwaysOnTop.Description" xml:space="preserve">
+    <value>ポーリングで歌詞ウィンドウを一番上に保ちましょう</value>
+  </data>
+  <data name="SettingsPageForceAlwaysOnTop.Header" xml:space="preserve">
+    <value>強制的に上に</value>
+  </data>
   <data name="SettingsPageFPS.Header" xml:space="preserve">
     <value>レンダリングフレームレート</value>
   </data>
-  <data name="SettingsPageGlobalDrag.Description" xml:space="preserve">
-    <value>タイトルバーをページ全体に拡張して、ウィンドウを非対話領域でドラッグできるようにします</value>
-  </data>
-  <data name="SettingsPageGlobalDrag.Header" xml:space="preserve">
-    <value>グローバルドラッグ</value>
+  <data name="SettingsPageFullscreenMode.Text" xml:space="preserve">
+    <value>フルスクリーンモード</value>
   </data>
   <data name="SettingsPageHideWindow.Description" xml:space="preserve">
-    <value>ドッキングモードまたはデスクトップモードでは、曲が再生されていない場合、ウィンドウは自動的に非表示になります。それ以外の場合、ウィンドウが自動的に表示されます。</value>
+    <value>音楽が再生されていないときに、自動的に歌詞ウィンドウを非表示/表示します</value>
   </data>
   <data name="SettingsPageHideWindow.Header" xml:space="preserve">
     <value>Windowsを自動的に非表示/表示します</value>
   </data>
-  <data name="SettingsPageIgnoreFullscreenWindow.Description" xml:space="preserve">
-    <value>このアプリは、ドッキングまたはデスクトップモードが有効になっているときにフルスクリーンアプリの上に表示されます</value>
-  </data>
-  <data name="SettingsPageIgnoreFullscreenWindow.Header" xml:space="preserve">
-    <value>常にフルスクリーンアプリケーションを常に把握してください</value>
-  </data>
   <data name="SettingsPageImportSettingsButton.Content" xml:space="preserve">
     <value>設定をインポートします</value>
   </data>
@@ -727,14 +778,23 @@
   <data name="SettingsPageLastFMUsername.Header" xml:space="preserve">
     <value>ユーザー名</value>
   </data>
+  <data name="SettingsPageLayoutOrientation.Header" xml:space="preserve">
+    <value>レイアウトの向き</value>
+  </data>
+  <data name="SettingsPageLayoutOrientationHorizontal.Content" xml:space="preserve">
+    <value>水平方向</value>
+  </data>
+  <data name="SettingsPageLayoutOrientationVertical.Content" xml:space="preserve">
+    <value>垂直方向</value>
+  </data>
   <data name="SettingsPageLibreTranslateServer.Header" xml:space="preserve">
     <value>サーバーアドレス</value>
   </data>
   <data name="SettingsPageLight.Content" xml:space="preserve">
     <value>ライト</value>
   </data>
-  <data name="SettingsPageLockHotKey.Header" xml:space="preserve">
-    <value>ショートカットキーのロックを解除およびロックします</value>
+  <data name="SettingsPageListenNewSession.Header" xml:space="preserve">
+    <value>新しい再生ソースの監視を有効にします</value>
   </data>
   <data name="SettingsPageLog.Header" xml:space="preserve">
     <value>ログレコード</value>
@@ -742,7 +802,7 @@
   <data name="SettingsPageLXMusicServer.Text" xml:space="preserve">
     <value>LX Music Server</value>
   </data>
-  <data name="SettingsPageLyrics.Content" xml:space="preserve">
+  <data name="SettingsPageLyrics.Text" xml:space="preserve">
     <value>歌詞のスタイルと効果</value>
   </data>
   <data name="SettingsPageLyricsAlignment.Header" xml:space="preserve">
@@ -751,15 +811,6 @@
   <data name="SettingsPageLyricsBackground.Header" xml:space="preserve">
     <value>歌詞の背景</value>
   </data>
-  <data name="SettingsPageLyricsBackgroundBlurAmount.Header" xml:space="preserve">
-    <value>アルバムの背景レイヤーの曖昧さ</value>
-  </data>
-  <data name="SettingsPageLyricsBackgroundOpacity.Header" xml:space="preserve">
-    <value>アルバムの背景レイヤーの不透明度</value>
-  </data>
-  <data name="SettingsPageLyricsBackgroundSpeed.Header" xml:space="preserve">
-    <value>アルバムの背景レイヤーのモーションレート</value>
-  </data>
   <data name="SettingsPageLyricsBgFontColor.Header" xml:space="preserve">
     <value>フォントカラー（非電流再生エリア）</value>
   </data>
@@ -859,9 +910,6 @@
   <data name="SettingsPageLyricsNormal.Content" xml:space="preserve">
     <value>普通</value>
   </data>
-  <data name="SettingsPageLyricsPureColorBgOpacity.Header" xml:space="preserve">
-    <value>無地の背景レイヤーの不透明度</value>
-  </data>
   <data name="SettingsPageLyricsRendingScopeCurrentChar.Content" xml:space="preserve">
     <value>現在の文字</value>
   </data>
@@ -913,9 +961,15 @@
   <data name="SettingsPageLyricsVerticalEdgeOpacity.Header" xml:space="preserve">
     <value>上端と下端の不透明度</value>
   </data>
-  <data name="SettingsPageLyricsWindowManager.Header" xml:space="preserve">
+  <data name="SettingsPageLyricsWindowManager.Text" xml:space="preserve">
     <value>歌詞ウィンドウマネージャー</value>
   </data>
+  <data name="SettingsPageLyricsWindowMgr.Content" xml:space="preserve">
+    <value>歌詞ウィンドウマネージャー</value>
+  </data>
+  <data name="SettingsPageLyricsWindowSwitchHotKey.Header" xml:space="preserve">
+    <value>歌詞ウィンドウステータススイッチャーショートカット</value>
+  </data>
   <data name="SettingsPageMediaLib.Content" xml:space="preserve">
     <value>メディアライブラリ</value>
   </data>
@@ -940,13 +994,19 @@
   <data name="SettingsPageMusicLibRealTimeWatch.Header" xml:space="preserve">
     <value>ファイルの変更をリアルタイムで聞いてください</value>
   </data>
+  <data name="SettingsPageNarrowMode.Text" xml:space="preserve">
+    <value>狭い</value>
+  </data>
   <data name="SettingsPageNextSongHotKey.Header" xml:space="preserve">
     <value>次のトラックショートカットキー</value>
   </data>
   <data name="SettingsPageNoBackdrop.Content" xml:space="preserve">
     <value>なし</value>
   </data>
-  <data name="SettingsPageOpenLogFolderButton.Content" xml:space="preserve">
+  <data name="SettingsPageOpacity.Header" xml:space="preserve">
+    <value>不透明度</value>
+  </data>
+  <data name="SettingsPageOpenFolderButton.Content" xml:space="preserve">
     <value>ファイルエクスプローラーで開きます</value>
   </data>
   <data name="SettingsPagePathBeIncludedInfo" xml:space="preserve">
@@ -982,9 +1042,15 @@
   <data name="SettingsPagePreviousSongHotKey.Header" xml:space="preserve">
     <value>前のトラックのショートカットキー</value>
   </data>
+  <data name="SettingsPagePureLayer.Header" xml:space="preserve">
+    <value>ピュアカラーレイヤー</value>
+  </data>
   <data name="SettingsPageQQGroup.Content" xml:space="preserve">
     <value>QQフィードバック＆チャットグループ</value>
   </data>
+  <data name="SettingsPageRealtimeStatus.Text" xml:space="preserve">
+    <value>リアルタイムステータス</value>
+  </data>
   <data name="SettingsPageRecord.Content" xml:space="preserve">
     <value>記録</value>
   </data>
@@ -1039,6 +1105,9 @@
   <data name="SettingsPageServerTestSuccessInfo" xml:space="preserve">
     <value>サーバーテストが成功しました</value>
   </data>
+  <data name="SettingsPageSettings.Header" xml:space="preserve">
+    <value>設定</value>
+  </data>
   <data name="SettingsPageSettingsManager.Header" xml:space="preserve">
     <value>設定マネージャー</value>
   </data>
@@ -1048,9 +1117,21 @@
   <data name="SettingsPageShortcutRegSuccessInfo" xml:space="preserve">
     <value>このホットキーは正常に登録されています</value>
   </data>
+  <data name="SettingsPageShowArtists.Header" xml:space="preserve">
+    <value>アーティスト</value>
+  </data>
   <data name="SettingsPageShowHideHotKey.Header" xml:space="preserve">
     <value>歌詞ウィンドウディスプレイとショートカットキーを非表示にします</value>
   </data>
+  <data name="SettingsPageShowInSwitchers.Description" xml:space="preserve">
+    <value>例：Alt + Tab、タスクバー</value>
+  </data>
+  <data name="SettingsPageShowInSwitchers.Header" xml:space="preserve">
+    <value>システム環境に表示します</value>
+  </data>
+  <data name="SettingsPageShowTitle.Header" xml:space="preserve">
+    <value>タイトルを表示</value>
+  </data>
   <data name="SettingsPageSliderPrefix.Text" xml:space="preserve">
     <value>現在の値： </value>
   </data>
@@ -1069,6 +1150,15 @@
   <data name="SettingsPageSongInfoRight.Content" xml:space="preserve">
     <value>右</value>
   </data>
+  <data name="SettingsPageSpectrumLayer.Header" xml:space="preserve">
+    <value>スペクトラムレイヤー</value>
+  </data>
+  <data name="SettingsPageSpeed.Header" xml:space="preserve">
+    <value>モーション</value>
+  </data>
+  <data name="SettingsPageStandardMode.Text" xml:space="preserve">
+    <value>標準モード</value>
+  </data>
   <data name="SettingsPageSystemLanguage.Content" xml:space="preserve">
     <value>デフォルト</value>
   </data>
@@ -1087,6 +1177,15 @@
   <data name="SettingsPageTitle" xml:space="preserve">
     <value>設定 - BetterLyrics</value>
   </data>
+  <data name="SettingsPageTitleBarAreaNone.Content" xml:space="preserve">
+    <value>なし</value>
+  </data>
+  <data name="SettingsPageTitleBarAreaTop.Content" xml:space="preserve">
+    <value>トップ</value>
+  </data>
+  <data name="SettingsPageTitleBarAreaWhole.Content" xml:space="preserve">
+    <value>窓全体</value>
+  </data>
   <data name="SettingsPageTitleBarType.Header" xml:space="preserve">
     <value>タイトルバーサイズ</value>
   </data>
@@ -1108,6 +1207,18 @@
   <data name="SettingsPageVersion.Text" xml:space="preserve">
     <value>バージョン</value>
   </data>
+  <data name="SettingsPageWorkArea.Description" xml:space="preserve">
+    <value>画面の上下端にドッキングされた別の作業エリアとして</value>
+  </data>
+  <data name="SettingsPageWorkArea.Header" xml:space="preserve">
+    <value>kawasan kerja</value>
+  </data>
+  <data name="SettingsPageWorkAreaHeight.Header" xml:space="preserve">
+    <value>作業エリアの高さ</value>
+  </data>
+  <data name="StandardMode" xml:space="preserve">
+    <value>標準モード</value>
+  </data>
   <data name="SystemTrayExit.Text" xml:space="preserve">
     <value>プログラムを終了します</value>
   </data>
@@ -1129,9 +1240,6 @@
   <data name="SystemTraySettings.Text" xml:space="preserve">
     <value>設定を開く</value>
   </data>
-  <data name="SystemTrayUnlock.Text" xml:space="preserve">
-    <value>ウィンドウのロックを解除します</value>
-  </data>
   <data name="TranslateServerNotSet" xml:space="preserve">
     <value>翻訳サーバーは設定されていません。最初に設定で構成してください</value>
   </data>

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

@@ -123,27 +123,12 @@
   <data name="AlbumArtSearchSMTCProvider" xml:space="preserve">
     <value>음악 플레이어</value>
   </data>
-  <data name="AllLyricsSettingsControlDesktop.Content" xml:space="preserve">
-    <value>데스크탑 모드</value>
-  </data>
-  <data name="AllLyricsSettingsControlDock.Content" xml:space="preserve">
-    <value>도크 모드</value>
-  </data>
   <data name="AllLyricsSettingsControlPictureInPicture.Content" xml:space="preserve">
     <value>사진 인당 모드</value>
   </data>
-  <data name="AllLyricsSettingsControlStandard.Content" xml:space="preserve">
-    <value>표준 모드</value>
-  </data>
-  <data name="AppSettingsControlGeneral.Content" xml:space="preserve">
+  <data name="AppSettingsControlGeneral.Text" xml:space="preserve">
     <value>일반적인</value>
   </data>
-  <data name="BaseWindowEnterFullScreenHint" xml:space="preserve">
-    <value>ESC를 눌러 전체 화면 모드를 종료하십시오</value>
-  </data>
-  <data name="BaseWindowFullScreenFlyoutItem.Text" xml:space="preserve">
-    <value>전체 화면</value>
-  </data>
   <data name="BaseWindowHostInfoBarCheckBox.Content" xml:space="preserve">
     <value>이 메시지를 다시 표시하지 마십시오</value>
   </data>
@@ -153,32 +138,38 @@
   <data name="Cancel" xml:space="preserve">
     <value>취소</value>
   </data>
+  <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>
+  <data name="DockedMode" xml:space="preserve">
+    <value>도킹 모드</value>
+  </data>
   <data name="ExportSettingsSuccess" xml:space="preserve">
     <value>수출 성공</value>
   </data>
   <data name="FailToStartLXMusicServer" xml:space="preserve">
     <value>LX Music Server에 연결할 수 없습니다. 설정으로 이동하십시오 - 고급 옵션이 링크가 올바르게 입력되었는지 확인하십시오.</value>
   </data>
+  <data name="FullscreenMode" xml:space="preserve">
+    <value>전체화면 모드</value>
+  </data>
   <data name="HostWindowClickThroughButton.Content" xml:space="preserve">
     <value>잠금</value>
   </data>
   <data name="HostWindowClickThroughFlyoutItem.Text" xml:space="preserve">
     <value>잠금</value>
   </data>
-  <data name="HostWindowDesktopFlyoutItem.Text" xml:space="preserve">
-    <value>데스크탑 모드</value>
-  </data>
-  <data name="HostWindowDockFlyoutItem.Text" xml:space="preserve">
-    <value>도크 모드</value>
-  </data>
   <data name="HostWindowLockToolTip.Text" xml:space="preserve">
     <value>잠금</value>
   </data>
-  <data name="HostWindowMoreButtonToolTip.Content" xml:space="preserve">
-    <value>더</value>
+  <data name="HostWindowMusicGalleryButtonToolTip.Content" xml:space="preserve">
+    <value>음악 갤러리</value>
   </data>
   <data name="HostWindowSettingsFlyoutItem.Text" xml:space="preserve">
     <value>설정</value>
@@ -223,7 +214,7 @@
     <value>가사를 수동으로 검색합니다</value>
   </data>
   <data name="LyricsPageLyricsSettingsButtonToolTip.Content" xml:space="preserve">
-    <value>가사 스타일과 효과 빠른 설정</value>
+    <value>가사 창 관리 바로 가기 설정</value>
   </data>
   <data name="LyricsPagePlaybackSourceButtonToolTip.Content" xml:space="preserve">
     <value>재생 소스 빠른 설정</value>
@@ -303,11 +294,17 @@
   <data name="LyricsWindowImmersiveButtonToolTip.Content" xml:space="preserve">
     <value>몰입 형 모드</value>
   </data>
-  <data name="MainPageAlbumArtOnly.Content" xml:space="preserve">
-    <value>앨범 아트 만</value>
+  <data name="LyricsWindowSettingsControlCurrentLyricsWindowConfig.Text" xml:space="preserve">
+    <value>현재 가사 창 구성</value>
   </data>
-  <data name="MainPageDesktopLyricsToggler.ToolTipService.ToolTip" xml:space="preserve">
-    <value>데스크탑 가사 모드로 전환하십시오</value>
+  <data name="LyricsWindowSettingsControlLyricsWindowMode.Header" xml:space="preserve">
+    <value>가사 창 모드</value>
+  </data>
+  <data name="LyricsWindowSettingsControlSetDefault.Text" xml:space="preserve">
+    <value>기본 값으로 설정</value>
+  </data>
+  <data name="MainPageAlbumArtOnly.Content" xml:space="preserve">
+    <value>앨범 아트 영역만</value>
   </data>
   <data name="MainPageEnterImmersiveModeHint" xml:space="preserve">
     <value>토글 버튼을 표시하려면 다시 다시 가져옵니다</value>
@@ -442,6 +439,12 @@
   <data name="MusicGalleryPageTitle" xml:space="preserve">
     <value>음악 갤러리 - BetterLyrics</value>
   </data>
+  <data name="NarrowMode" xml:space="preserve">
+    <value>협폭 조명</value>
+  </data>
+  <data name="PictureInPictureMode" xml:space="preserve">
+    <value>사진 인당 모드</value>
+  </data>
   <data name="SetingsPageDonation.Text" xml:space="preserve">
     <value>기부</value>
   </data>
@@ -460,18 +463,33 @@
   <data name="SettingsPageAcrylicThin.Content" xml:space="preserve">
     <value>아크릴 얇은</value>
   </data>
+  <data name="SettingsPageAdaptEnvColor.Description" xml:space="preserve">
+    <value>동시에 가사 배경의 순수 컬러 레이어 불투명도와 앨범 아트 레이어 불투명도를 0으로 설정하면 정확한 효과를 얻을 수 있습니다</value>
+  </data>
+  <data name="SettingsPageAdaptEnvColor.Header" xml:space="preserve">
+    <value>환경 색상에 적응하세요</value>
+  </data>
   <data name="SettingsPageAddFolder.Header" xml:space="preserve">
     <value>폴더를 추가하십시오</value>
   </data>
   <data name="SettingsPageAddFolderButton.Content" xml:space="preserve">
     <value>추가하다</value>
   </data>
+  <data name="SettingsPageAdvanced.Text" xml:space="preserve">
+    <value>고급 옵션</value>
+  </data>
   <data name="SettingsPageAlbumArt.Text" xml:space="preserve">
     <value>앨범 아트</value>
   </data>
+  <data name="SettingsPageAlbumArtLayer.Header" xml:space="preserve">
+    <value>앨범 아트 레이어</value>
+  </data>
   <data name="SettingsPageAlbumArtSearchProvidersConfig.Text" xml:space="preserve">
     <value>앨범 표지 소스를 구성합니다</value>
   </data>
+  <data name="SettingsPageAlbumArtSize.Header" xml:space="preserve">
+    <value>앨범아트</value>
+  </data>
   <data name="SettingsPageAlbumLib.Content" xml:space="preserve">
     <value>앨범 아트 소스</value>
   </data>
@@ -481,14 +499,14 @@
   <data name="SettingsPageAlbumShadowAmount.Header" xml:space="preserve">
     <value>그림자가 얼마나 퍼져나가는지</value>
   </data>
-  <data name="SettingsPageAlbumStyle.Content" xml:space="preserve">
+  <data name="SettingsPageAlbumStyle.Text" xml:space="preserve">
     <value>앨범 영역 스타일</value>
   </data>
   <data name="SettingsPageAmount.Header" xml:space="preserve">
     <value>금액</value>
   </data>
   <data name="SettingsPageAOT.Header" xml:space="preserve">
-    <value>항상 위에</value>
+    <value>가사 창을 맨 위로 가져옵니다</value>
   </data>
   <data name="SettingsPageApp.Content" xml:space="preserve">
     <value>앱 외관과 행동</value>
@@ -497,29 +515,17 @@
     <value>앱 모양</value>
   </data>
   <data name="SettingsPageAppBehavior.Text" xml:space="preserve">
-    <value>앱 동작</value>
+    <value>일반적인 행동</value>
   </data>
   <data name="SettingsPageApply.Content" xml:space="preserve">
     <value>적용하다</value>
   </data>
-  <data name="SettingsPageAutoLock.Header" xml:space="preserve">
-    <value>데스크탑 모드를 활성화 할 때 자동 잠금</value>
+  <data name="SettingsPageAutoSize.Header" xml:space="preserve">
+    <value>자동 크기 조정</value>
   </data>
   <data name="SettingsPageAutoStart.Header" xml:space="preserve">
     <value>자동 시작</value>
   </data>
-  <data name="SettingsPageAutoStartDesktopLyrics.Content" xml:space="preserve">
-    <value>데스크탑 모드를 시작하십시오</value>
-  </data>
-  <data name="SettingsPageAutoStartDockLyrics.Content" xml:space="preserve">
-    <value>도크 모드를 활성화하십시오</value>
-  </data>
-  <data name="SettingsPageAutoStartInAppLyrics.Content" xml:space="preserve">
-    <value>표준 모드를 ​​활성화합니다</value>
-  </data>
-  <data name="SettingsPageAutoStartPIPLyrics.Content" xml:space="preserve">
-    <value>Picture-in-Picture 모드를 시작하십시오</value>
-  </data>
   <data name="SettingsPageAutoStartWindow.Header" xml:space="preserve">
     <value>앱을 시작할 때</value>
   </data>
@@ -529,9 +535,18 @@
   <data name="SettingsPageBackgroundAcrylicEffectAmount.Header" xml:space="preserve">
     <value>앨범 배경 아크릴 효과 강도</value>
   </data>
-  <data name="SettingsPageBackgroundOverlay.Content" xml:space="preserve">
+  <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>
+  <data name="SettingsPageBorderlessHotKey.Header" xml:space="preserve">
+    <value>테두리 없는 가사 창 단축키</value>
+  </data>
   <data name="SettingsPageCache.Description" xml:space="preserve">
     <value>로그 파일, 네트워크 가사 캐시 포함</value>
   </data>
@@ -544,9 +559,27 @@
   <data name="SettingsPageChinesePreference.Header" xml:space="preserve">
     <value>중국어를 전통적인 중국어로 전환합니다</value>
   </data>
+  <data name="SettingsPageClickThrough.Header" xml:space="preserve">
+    <value>클릭률</value>
+  </data>
+  <data name="SettingsPageClickThroughHotKey.Header" xml:space="preserve">
+    <value>바로 가기 키를 클릭하세요</value>
+  </data>
   <data name="SettingsPageCompactTitleBar.Content" xml:space="preserve">
     <value>콤팩트</value>
   </data>
+  <data name="SettingsPageConfigName.Description" xml:space="preserve">
+    <value>녹화된 창 상태에 이름을 지정하면 더 잘 구별할 수 있습니다</value>
+  </data>
+  <data name="SettingsPageConfigName.Header" xml:space="preserve">
+    <value>환경 설정</value>
+  </data>
+  <data name="SettingsPageCreateFromCurrent.Content" xml:space="preserve">
+    <value>현재 가사 창 상태에서 만들기</value>
+  </data>
+  <data name="SettingsPageCreateFromTemplates.Content" xml:space="preserve">
+    <value>템플릿에서 만들기</value>
+  </data>
   <data name="SettingsPageCurrentLyricsWindowStatus.Text" xml:space="preserve">
     <value>현재 가사 창 상태</value>
   </data>
@@ -556,29 +589,29 @@
   <data name="SettingsPageDebugOverlay.Header" xml:space="preserve">
     <value>디버그 오버레이를 표시하십시오</value>
   </data>
-  <data name="SettingsPageDelete.Content" xml:space="preserve">
+  <data name="SettingsPageDelete.Text" xml:space="preserve">
     <value>삭제</value>
   </data>
-  <data name="SettingsPageDesktopAcrylic.Content" xml:space="preserve">
-    <value>데스크탑 아크릴</value>
+  <data name="SettingsPageDesktopMode.Text" xml:space="preserve">
+    <value>데스크톱 모드 (투명)</value>
   </data>
-  <data name="SettingsPageDev.Content" xml:space="preserve">
-    <value>고급 옵션</value>
-  </data>
-  <data name="SettingsPageDisclaimer.Text" xml:space="preserve">
+  <data name="SettingsPageDisclaimer.Message" xml:space="preserve">
     <value>이 프로젝트는 어떠한 종류의 보증도 없이 그대로 제공됩니다. 모든 가사, 글꼴, 아이콘 및 기타 제3자 리소스는 해당 저작권 소유자의 재산입니다. 이 프로젝트의 저자는 그러한 자원의 소유권을 주장하지 않습니다. 이 프로젝트는 비상업적이기 때문에 어떠한 권리도 침해해서는 안 됩니다. 사용자는 자신의 사용이 관련 법률 및 라이센스를 준수하는지 확인할 책임이 있습니다.</value>
   </data>
   <data name="SettingsPageDiscord.Content" xml:space="preserve">
     <value>Discord</value>
   </data>
   <data name="SettingsPageDisplayTypeSwitcher.Header" xml:space="preserve">
-    <value>가사 앨범 레이아웃 모드</value>
+    <value>레이아웃 모드</value>
+  </data>
+  <data name="SettingsPageDockedMode.Text" xml:space="preserve">
+    <value>도킹 모드</value>
   </data>
   <data name="SettingsPageDockMonitor.Header" xml:space="preserve">
     <value>대상 모니터</value>
   </data>
   <data name="SettingsPageDockPlacement.Header" xml:space="preserve">
-    <value>도크 모드 배치</value>
+    <value>작업 영역 배치</value>
   </data>
   <data name="SettingsPageDockPlacementBottom.Content" xml:space="preserve">
     <value>맨 아래</value>
@@ -589,6 +622,9 @@
   <data name="SettingsPageDockWindowHeight.Header" xml:space="preserve">
     <value>창 높이</value>
   </data>
+  <data name="SettingsPageDragArea.Header" xml:space="preserve">
+    <value>드래그 가능</value>
+  </data>
   <data name="SettingsPageDynamicLyricsFontSize.Header" xml:space="preserve">
     <value>자동 조정</value>
   </data>
@@ -634,6 +670,21 @@
   <data name="SettingsPageEN.Content" xml:space="preserve">
     <value>English</value>
   </data>
+  <data name="SettingsPageEnvColorSample.Header" xml:space="preserve">
+    <value>환경 컬러 삼페 모드</value>
+  </data>
+  <data name="SettingsPageEnvColorSampleAbove.Content" xml:space="preserve">
+    <value>창문 너머</value>
+  </data>
+  <data name="SettingsPageEnvColorSampleBelow.Content" xml:space="preserve">
+    <value>창문 아래</value>
+  </data>
+  <data name="SettingsPageEnvColorSampleEdge.Content" xml:space="preserve">
+    <value>창 가장자리</value>
+  </data>
+  <data name="SettingsPageEnvColorSampleInner.Content" xml:space="preserve">
+    <value>창문 안쪽</value>
+  </data>
   <data name="SettingsPageExitOnLyricsWindowClosed.Header" xml:space="preserve">
     <value>가사 창을 닫으면 프로그램을 종료하세요</value>
   </data>
@@ -652,30 +703,30 @@
   <data name="SettingsPageFixedTimeStep.Header" xml:space="preserve">
     <value>고정 시간 단계 렌더링</value>
   </data>
+  <data name="SettingsPageFluidLayer.Header" xml:space="preserve">
+    <value>유체 층</value>
+  </data>
   <data name="SettingsPageFollowSystem.Content" xml:space="preserve">
     <value>시스템을 따르십시오</value>
   </data>
+  <data name="SettingsPageForceAlwaysOnTop.Description" xml:space="preserve">
+    <value>투표를 통해 가사 창을 맨 위에 두세요</value>
+  </data>
+  <data name="SettingsPageForceAlwaysOnTop.Header" xml:space="preserve">
+    <value>꼭대기에 강제로</value>
+  </data>
   <data name="SettingsPageFPS.Header" xml:space="preserve">
     <value>렌더링 프레임 속도</value>
   </data>
-  <data name="SettingsPageGlobalDrag.Description" xml:space="preserve">
-    <value>비 중과 영역에서 창을 드래그 할 수 있도록 제목 표시 줄을 전체 페이지로 확장하십시오.</value>
-  </data>
-  <data name="SettingsPageGlobalDrag.Header" xml:space="preserve">
-    <value>글로벌 드래그</value>
+  <data name="SettingsPageFullscreenMode.Text" xml:space="preserve">
+    <value>전체화면 모드</value>
   </data>
   <data name="SettingsPageHideWindow.Description" xml:space="preserve">
-    <value>도킹 모드 또는 데스크탑 모드에서는 노래가 재생되지 않으면 창이 자동으로 숨겨집니다. 그렇지 않으면 창이 자동으로 표시됩니다.</value>
+    <value>음악이 재생되지 않을 때 자동으로 가사 창 숨기기/표시</value>
   </data>
   <data name="SettingsPageHideWindow.Header" xml:space="preserve">
     <value>Windows를 자동으로 숨기고 표시합니다</value>
   </data>
-  <data name="SettingsPageIgnoreFullscreenWindow.Description" xml:space="preserve">
-    <value>도킹 또는 데스크탑 모드가 활성화 될 때이 앱이 전체 화면 앱 위에 나타나도록 강요</value>
-  </data>
-  <data name="SettingsPageIgnoreFullscreenWindow.Header" xml:space="preserve">
-    <value>항상 전체 화면 응용 프로그램 위에 머물러 있습니다</value>
-  </data>
   <data name="SettingsPageImportSettingsButton.Content" xml:space="preserve">
     <value>가져 오기 설정</value>
   </data>
@@ -727,14 +778,23 @@
   <data name="SettingsPageLastFMUsername.Header" xml:space="preserve">
     <value>사용자 이름</value>
   </data>
+  <data name="SettingsPageLayoutOrientation.Header" xml:space="preserve">
+    <value>레이아웃 방향</value>
+  </data>
+  <data name="SettingsPageLayoutOrientationHorizontal.Content" xml:space="preserve">
+    <value>수평</value>
+  </data>
+  <data name="SettingsPageLayoutOrientationVertical.Content" xml:space="preserve">
+    <value>세로</value>
+  </data>
   <data name="SettingsPageLibreTranslateServer.Header" xml:space="preserve">
     <value>서버 주소</value>
   </data>
   <data name="SettingsPageLight.Content" xml:space="preserve">
     <value>빛</value>
   </data>
-  <data name="SettingsPageLockHotKey.Header" xml:space="preserve">
-    <value>바로 가기 키를 잠금 해제하고 잠그십시오</value>
+  <data name="SettingsPageListenNewSession.Header" xml:space="preserve">
+    <value>새로운 재생 소스에 대한 모니터링을 활성화하십시오</value>
   </data>
   <data name="SettingsPageLog.Header" xml:space="preserve">
     <value>로그 레코드</value>
@@ -742,7 +802,7 @@
   <data name="SettingsPageLXMusicServer.Text" xml:space="preserve">
     <value>LX 음악 서버</value>
   </data>
-  <data name="SettingsPageLyrics.Content" xml:space="preserve">
+  <data name="SettingsPageLyrics.Text" xml:space="preserve">
     <value>가사 스타일과 효과</value>
   </data>
   <data name="SettingsPageLyricsAlignment.Header" xml:space="preserve">
@@ -751,15 +811,6 @@
   <data name="SettingsPageLyricsBackground.Header" xml:space="preserve">
     <value>가사 배경</value>
   </data>
-  <data name="SettingsPageLyricsBackgroundBlurAmount.Header" xml:space="preserve">
-    <value>앨범 배경 레이어 모호성</value>
-  </data>
-  <data name="SettingsPageLyricsBackgroundOpacity.Header" xml:space="preserve">
-    <value>앨범 배경 레이어 불투명도</value>
-  </data>
-  <data name="SettingsPageLyricsBackgroundSpeed.Header" xml:space="preserve">
-    <value>앨범 배경 레이어 모션 속도</value>
-  </data>
   <data name="SettingsPageLyricsBgFontColor.Header" xml:space="preserve">
     <value>글꼴 색상 (비 전류 재생 영역)</value>
   </data>
@@ -859,9 +910,6 @@
   <data name="SettingsPageLyricsNormal.Content" xml:space="preserve">
     <value>정상</value>
   </data>
-  <data name="SettingsPageLyricsPureColorBgOpacity.Header" xml:space="preserve">
-    <value>단단한 배경 레이어 불투명도</value>
-  </data>
   <data name="SettingsPageLyricsRendingScopeCurrentChar.Content" xml:space="preserve">
     <value>현재 숯</value>
   </data>
@@ -913,9 +961,15 @@
   <data name="SettingsPageLyricsVerticalEdgeOpacity.Header" xml:space="preserve">
     <value>상단 및 하단 가장자리 불투명도</value>
   </data>
-  <data name="SettingsPageLyricsWindowManager.Header" xml:space="preserve">
+  <data name="SettingsPageLyricsWindowManager.Text" xml:space="preserve">
     <value>가사 창 관리자</value>
   </data>
+  <data name="SettingsPageLyricsWindowMgr.Content" xml:space="preserve">
+    <value>가사 창 관리자</value>
+  </data>
+  <data name="SettingsPageLyricsWindowSwitchHotKey.Header" xml:space="preserve">
+    <value>가사 창 상태 전환기 바로 가기</value>
+  </data>
   <data name="SettingsPageMediaLib.Content" xml:space="preserve">
     <value>미디어 라이브러리</value>
   </data>
@@ -940,13 +994,19 @@
   <data name="SettingsPageMusicLibRealTimeWatch.Header" xml:space="preserve">
     <value>실시간으로 파일 변경을 듣습니다</value>
   </data>
+  <data name="SettingsPageNarrowMode.Text" xml:space="preserve">
+    <value>협폭 조명</value>
+  </data>
   <data name="SettingsPageNextSongHotKey.Header" xml:space="preserve">
     <value>다음 트랙 바로 가기 키</value>
   </data>
   <data name="SettingsPageNoBackdrop.Content" xml:space="preserve">
     <value>없음</value>
   </data>
-  <data name="SettingsPageOpenLogFolderButton.Content" xml:space="preserve">
+  <data name="SettingsPageOpacity.Header" xml:space="preserve">
+    <value>투명도</value>
+  </data>
+  <data name="SettingsPageOpenFolderButton.Content" xml:space="preserve">
     <value>파일 탐색기에서 열립니다</value>
   </data>
   <data name="SettingsPagePathBeIncludedInfo" xml:space="preserve">
@@ -982,9 +1042,15 @@
   <data name="SettingsPagePreviousSongHotKey.Header" xml:space="preserve">
     <value>이전 트랙의 바로 가기 키</value>
   </data>
+  <data name="SettingsPagePureLayer.Header" xml:space="preserve">
+    <value>순수한 컬러 레이어</value>
+  </data>
   <data name="SettingsPageQQGroup.Content" xml:space="preserve">
     <value>QQ 피드백 및 채팅 그룹</value>
   </data>
+  <data name="SettingsPageRealtimeStatus.Text" xml:space="preserve">
+    <value>실시간 상태</value>
+  </data>
   <data name="SettingsPageRecord.Content" xml:space="preserve">
     <value>기록</value>
   </data>
@@ -1039,6 +1105,9 @@
   <data name="SettingsPageServerTestSuccessInfo" xml:space="preserve">
     <value>서버 테스트 성공</value>
   </data>
+  <data name="SettingsPageSettings.Header" xml:space="preserve">
+    <value>설정</value>
+  </data>
   <data name="SettingsPageSettingsManager.Header" xml:space="preserve">
     <value>설정 관리자</value>
   </data>
@@ -1048,9 +1117,21 @@
   <data name="SettingsPageShortcutRegSuccessInfo" xml:space="preserve">
     <value>이 핫키는 성공적으로 등록되었습니다</value>
   </data>
+  <data name="SettingsPageShowArtists.Header" xml:space="preserve">
+    <value>예술가</value>
+  </data>
   <data name="SettingsPageShowHideHotKey.Header" xml:space="preserve">
     <value>가사 창 디스플레이 및 바로 가기 키 숨기기</value>
   </data>
+  <data name="SettingsPageShowInSwitchers.Description" xml:space="preserve">
+    <value>예: Alt + Tab, 작업 표시줄</value>
+  </data>
+  <data name="SettingsPageShowInSwitchers.Header" xml:space="preserve">
+    <value>시스템 환경에서 보여주세요</value>
+  </data>
+  <data name="SettingsPageShowTitle.Header" xml:space="preserve">
+    <value>제목 표시</value>
+  </data>
   <data name="SettingsPageSliderPrefix.Text" xml:space="preserve">
     <value>현재 가치 : </value>
   </data>
@@ -1069,6 +1150,15 @@
   <data name="SettingsPageSongInfoRight.Content" xml:space="preserve">
     <value>오른쪽</value>
   </data>
+  <data name="SettingsPageSpectrumLayer.Header" xml:space="preserve">
+    <value>스펙트럼 레이어</value>
+  </data>
+  <data name="SettingsPageSpeed.Header" xml:space="preserve">
+    <value>모션</value>
+  </data>
+  <data name="SettingsPageStandardMode.Text" xml:space="preserve">
+    <value>표준 모드</value>
+  </data>
   <data name="SettingsPageSystemLanguage.Content" xml:space="preserve">
     <value>기본</value>
   </data>
@@ -1087,6 +1177,15 @@
   <data name="SettingsPageTitle" xml:space="preserve">
     <value>설정 - BetterLyrics</value>
   </data>
+  <data name="SettingsPageTitleBarAreaNone.Content" xml:space="preserve">
+    <value>없음</value>
+  </data>
+  <data name="SettingsPageTitleBarAreaTop.Content" xml:space="preserve">
+    <value>맨 위</value>
+  </data>
+  <data name="SettingsPageTitleBarAreaWhole.Content" xml:space="preserve">
+    <value>창문 전체</value>
+  </data>
   <data name="SettingsPageTitleBarType.Header" xml:space="preserve">
     <value>제목 바 크기</value>
   </data>
@@ -1108,6 +1207,18 @@
   <data name="SettingsPageVersion.Text" xml:space="preserve">
     <value>버전</value>
   </data>
+  <data name="SettingsPageWorkArea.Description" xml:space="preserve">
+    <value>화면의 상단/하단 가장자리에 고정된 별도의 작업 영역으로</value>
+  </data>
+  <data name="SettingsPageWorkArea.Header" xml:space="preserve">
+    <value>작업 구역</value>
+  </data>
+  <data name="SettingsPageWorkAreaHeight.Header" xml:space="preserve">
+    <value>작업 영역 높이</value>
+  </data>
+  <data name="StandardMode" xml:space="preserve">
+    <value>표준 모드</value>
+  </data>
   <data name="SystemTrayExit.Text" xml:space="preserve">
     <value>프로그램을 종료하십시오</value>
   </data>
@@ -1129,9 +1240,6 @@
   <data name="SystemTraySettings.Text" xml:space="preserve">
     <value>열기 설정</value>
   </data>
-  <data name="SystemTrayUnlock.Text" xml:space="preserve">
-    <value>창을 잠금 해제하십시오</value>
-  </data>
   <data name="TranslateServerNotSet" xml:space="preserve">
     <value>번역 서버가 설정되지 않았습니다. 먼저 설정으로 구성하십시오.</value>
   </data>

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

@@ -123,27 +123,12 @@
   <data name="AlbumArtSearchSMTCProvider" xml:space="preserve">
     <value>音乐播放器</value>
   </data>
-  <data name="AllLyricsSettingsControlDesktop.Content" xml:space="preserve">
-    <value>桌面模式</value>
-  </data>
-  <data name="AllLyricsSettingsControlDock.Content" xml:space="preserve">
-    <value>停靠模式</value>
-  </data>
   <data name="AllLyricsSettingsControlPictureInPicture.Content" xml:space="preserve">
     <value>画中画模式</value>
   </data>
-  <data name="AllLyricsSettingsControlStandard.Content" xml:space="preserve">
-    <value>标准模式</value>
-  </data>
-  <data name="AppSettingsControlGeneral.Content" xml:space="preserve">
+  <data name="AppSettingsControlGeneral.Text" xml:space="preserve">
     <value>通用</value>
   </data>
-  <data name="BaseWindowEnterFullScreenHint" xml:space="preserve">
-    <value>按 Esc 退出全屏模式</value>
-  </data>
-  <data name="BaseWindowFullScreenFlyoutItem.Text" xml:space="preserve">
-    <value>全屏</value>
-  </data>
   <data name="BaseWindowHostInfoBarCheckBox.Content" xml:space="preserve">
     <value>不再显示此消息</value>
   </data>
@@ -153,32 +138,38 @@
   <data name="Cancel" xml:space="preserve">
     <value>取消</value>
   </data>
+  <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>
+  <data name="DockedMode" xml:space="preserve">
+    <value>停靠模式</value>
+  </data>
   <data name="ExportSettingsSuccess" xml:space="preserve">
     <value>导出成功</value>
   </data>
   <data name="FailToStartLXMusicServer" xml:space="preserve">
     <value>无法连接到 LX 音乐服务器，请转到设置 - 高级选项以检查是否正确输入链接</value>
   </data>
+  <data name="FullscreenMode" xml:space="preserve">
+    <value>全屏模式</value>
+  </data>
   <data name="HostWindowClickThroughButton.Content" xml:space="preserve">
     <value>锁定</value>
   </data>
   <data name="HostWindowClickThroughFlyoutItem.Text" xml:space="preserve">
     <value>锁定</value>
   </data>
-  <data name="HostWindowDesktopFlyoutItem.Text" xml:space="preserve">
-    <value>桌面模式</value>
-  </data>
-  <data name="HostWindowDockFlyoutItem.Text" xml:space="preserve">
-    <value>停靠模式</value>
-  </data>
   <data name="HostWindowLockToolTip.Text" xml:space="preserve">
     <value>锁定</value>
   </data>
-  <data name="HostWindowMoreButtonToolTip.Content" xml:space="preserve">
-    <value>更多</value>
+  <data name="HostWindowMusicGalleryButtonToolTip.Content" xml:space="preserve">
+    <value>音乐库</value>
   </data>
   <data name="HostWindowSettingsFlyoutItem.Text" xml:space="preserve">
     <value>设置</value>
@@ -223,7 +214,7 @@
     <value>手动检索歌词</value>
   </data>
   <data name="LyricsPageLyricsSettingsButtonToolTip.Content" xml:space="preserve">
-    <value>歌词样式与效果快捷设置</value>
+    <value>歌词窗口管理快捷设置</value>
   </data>
   <data name="LyricsPagePlaybackSourceButtonToolTip.Content" xml:space="preserve">
     <value>播放源快捷设置</value>
@@ -303,11 +294,17 @@
   <data name="LyricsWindowImmersiveButtonToolTip.Content" xml:space="preserve">
     <value>沉浸模式</value>
   </data>
-  <data name="MainPageAlbumArtOnly.Content" xml:space="preserve">
-    <value>仅显示专辑封面</value>
+  <data name="LyricsWindowSettingsControlCurrentLyricsWindowConfig.Text" xml:space="preserve">
+    <value>当前歌词窗口配置</value>
   </data>
-  <data name="MainPageDesktopLyricsToggler.ToolTipService.ToolTip" xml:space="preserve">
-    <value>切换到桌面歌词模式</value>
+  <data name="LyricsWindowSettingsControlLyricsWindowMode.Header" xml:space="preserve">
+    <value>歌词窗口模式</value>
+  </data>
+  <data name="LyricsWindowSettingsControlSetDefault.Text" xml:space="preserve">
+    <value>设为默认</value>
+  </data>
+  <data name="MainPageAlbumArtOnly.Content" xml:space="preserve">
+    <value>仅显示专辑区域</value>
   </data>
   <data name="MainPageEnterImmersiveModeHint" xml:space="preserve">
     <value>再次悬停以显示切换按钮</value>
@@ -442,6 +439,12 @@
   <data name="MusicGalleryPageTitle" xml:space="preserve">
     <value>音乐库 - BetterLyrics</value>
   </data>
+  <data name="NarrowMode" xml:space="preserve">
+    <value>窄屏模式</value>
+  </data>
+  <data name="PictureInPictureMode" xml:space="preserve">
+    <value>画中画模式</value>
+  </data>
   <data name="SetingsPageDonation.Text" xml:space="preserve">
     <value>捐贈</value>
   </data>
@@ -460,18 +463,33 @@
   <data name="SettingsPageAcrylicThin.Content" xml:space="preserve">
     <value>亚克力（薄层）</value>
   </data>
+  <data name="SettingsPageAdaptEnvColor.Description" xml:space="preserve">
+    <value>同时，将歌词背景中的纯色图层不透明度和专辑美术图层不透明度设置为 0 ，以获得正确的效果</value>
+  </data>
+  <data name="SettingsPageAdaptEnvColor.Header" xml:space="preserve">
+    <value>适应环境色彩</value>
+  </data>
   <data name="SettingsPageAddFolder.Header" xml:space="preserve">
     <value>添加文件夹</value>
   </data>
   <data name="SettingsPageAddFolderButton.Content" xml:space="preserve">
     <value>添加</value>
   </data>
+  <data name="SettingsPageAdvanced.Text" xml:space="preserve">
+    <value>高级选项</value>
+  </data>
   <data name="SettingsPageAlbumArt.Text" xml:space="preserve">
     <value>专辑</value>
   </data>
+  <data name="SettingsPageAlbumArtLayer.Header" xml:space="preserve">
+    <value>专辑艺术图层</value>
+  </data>
   <data name="SettingsPageAlbumArtSearchProvidersConfig.Text" xml:space="preserve">
     <value>配置专辑封面源</value>
   </data>
+  <data name="SettingsPageAlbumArtSize.Header" xml:space="preserve">
+    <value>专辑封面</value>
+  </data>
   <data name="SettingsPageAlbumLib.Content" xml:space="preserve">
     <value>专辑封面源</value>
   </data>
@@ -481,14 +499,14 @@
   <data name="SettingsPageAlbumShadowAmount.Header" xml:space="preserve">
     <value>阴影扩散程度</value>
   </data>
-  <data name="SettingsPageAlbumStyle.Content" xml:space="preserve">
+  <data name="SettingsPageAlbumStyle.Text" xml:space="preserve">
     <value>专辑区域样式</value>
   </data>
   <data name="SettingsPageAmount.Header" xml:space="preserve">
     <value>量</value>
   </data>
   <data name="SettingsPageAOT.Header" xml:space="preserve">
-    <value>将应用置于顶层</value>
+    <value>将歌词窗口置于顶层</value>
   </data>
   <data name="SettingsPageApp.Content" xml:space="preserve">
     <value>应用外观与行为</value>
@@ -497,29 +515,17 @@
     <value>应用外观</value>
   </data>
   <data name="SettingsPageAppBehavior.Text" xml:space="preserve">
-    <value>应用行为</value>
+    <value>一般行为</value>
   </data>
   <data name="SettingsPageApply.Content" xml:space="preserve">
     <value>应用</value>
   </data>
-  <data name="SettingsPageAutoLock.Header" xml:space="preserve">
-    <value>启动桌面模式时随即锁定窗口</value>
+  <data name="SettingsPageAutoSize.Header" xml:space="preserve">
+    <value>自动调整尺寸</value>
   </data>
   <data name="SettingsPageAutoStart.Header" xml:space="preserve">
     <value>自动启动</value>
   </data>
-  <data name="SettingsPageAutoStartDesktopLyrics.Content" xml:space="preserve">
-    <value>启动桌面模式</value>
-  </data>
-  <data name="SettingsPageAutoStartDockLyrics.Content" xml:space="preserve">
-    <value>启动停靠模式</value>
-  </data>
-  <data name="SettingsPageAutoStartInAppLyrics.Content" xml:space="preserve">
-    <value>启动标准模式</value>
-  </data>
-  <data name="SettingsPageAutoStartPIPLyrics.Content" xml:space="preserve">
-    <value>启动画中画模式</value>
-  </data>
   <data name="SettingsPageAutoStartWindow.Header" xml:space="preserve">
     <value>启动应用时</value>
   </data>
@@ -529,9 +535,18 @@
   <data name="SettingsPageBackgroundAcrylicEffectAmount.Header" xml:space="preserve">
     <value>专辑背景亚克力效果强度</value>
   </data>
-  <data name="SettingsPageBackgroundOverlay.Content" xml:space="preserve">
+  <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>
+  <data name="SettingsPageBorderlessHotKey.Header" xml:space="preserve">
+    <value>无边框歌词窗口快捷方式</value>
+  </data>
   <data name="SettingsPageCache.Description" xml:space="preserve">
     <value>包括日志文件，网络歌词缓存</value>
   </data>
@@ -544,9 +559,27 @@
   <data name="SettingsPageChinesePreference.Header" xml:space="preserve">
     <value>中文转换为繁体</value>
   </data>
+  <data name="SettingsPageClickThrough.Header" xml:space="preserve">
+    <value>点击穿透</value>
+  </data>
+  <data name="SettingsPageClickThroughHotKey.Header" xml:space="preserve">
+    <value>点击穿透快捷键</value>
+  </data>
   <data name="SettingsPageCompactTitleBar.Content" xml:space="preserve">
     <value>紧凑</value>
   </data>
+  <data name="SettingsPageConfigName.Description" xml:space="preserve">
+    <value>命名记录的窗口状态可以帮助您更好地区分它们</value>
+  </data>
+  <data name="SettingsPageConfigName.Header" xml:space="preserve">
+    <value>配置名称</value>
+  </data>
+  <data name="SettingsPageCreateFromCurrent.Content" xml:space="preserve">
+    <value>从当前歌词窗口状态创建</value>
+  </data>
+  <data name="SettingsPageCreateFromTemplates.Content" xml:space="preserve">
+    <value>从模板创建</value>
+  </data>
   <data name="SettingsPageCurrentLyricsWindowStatus.Text" xml:space="preserve">
     <value>当前歌词窗口状态</value>
   </data>
@@ -556,29 +589,29 @@
   <data name="SettingsPageDebugOverlay.Header" xml:space="preserve">
     <value>显示调试覆盖层</value>
   </data>
-  <data name="SettingsPageDelete.Content" xml:space="preserve">
+  <data name="SettingsPageDelete.Text" xml:space="preserve">
     <value>删除</value>
   </data>
-  <data name="SettingsPageDesktopAcrylic.Content" xml:space="preserve">
-    <value>亚克力（桌面）</value>
+  <data name="SettingsPageDesktopMode.Text" xml:space="preserve">
+    <value>桌面模式（透明）</value>
   </data>
-  <data name="SettingsPageDev.Content" xml:space="preserve">
-    <value>高级选项</value>
-  </data>
-  <data name="SettingsPageDisclaimer.Text" xml:space="preserve">
+  <data name="SettingsPageDisclaimer.Message" xml:space="preserve">
     <value>本项目按原样提供，不提供任何形式的保证。所有歌词、字体、图标和其他第三方资源均为其各自版权所有者的财产。本项目的作者不主张此类资源的所有权。本项目为非商业性项目，不得用于侵犯任何权利。用户有责任确保自己的使用符合适用的法律和许可。</value>
   </data>
   <data name="SettingsPageDiscord.Content" xml:space="preserve">
     <value>Discord</value>
   </data>
   <data name="SettingsPageDisplayTypeSwitcher.Header" xml:space="preserve">
-    <value>歌词专辑布局模式</value>
+    <value>布局模式</value>
+  </data>
+  <data name="SettingsPageDockedMode.Text" xml:space="preserve">
+    <value>停靠模式</value>
   </data>
   <data name="SettingsPageDockMonitor.Header" xml:space="preserve">
     <value>目标显示器</value>
   </data>
   <data name="SettingsPageDockPlacement.Header" xml:space="preserve">
-    <value>停靠模式位置</value>
+    <value>工作区域位置</value>
   </data>
   <data name="SettingsPageDockPlacementBottom.Content" xml:space="preserve">
     <value>底部</value>
@@ -589,6 +622,9 @@
   <data name="SettingsPageDockWindowHeight.Header" xml:space="preserve">
     <value>窗口高度</value>
   </data>
+  <data name="SettingsPageDragArea.Header" xml:space="preserve">
+    <value>可拖拽区域</value>
+  </data>
   <data name="SettingsPageDynamicLyricsFontSize.Header" xml:space="preserve">
     <value>自动调整</value>
   </data>
@@ -634,6 +670,21 @@
   <data name="SettingsPageEN.Content" xml:space="preserve">
     <value>English</value>
   </data>
+  <data name="SettingsPageEnvColorSample.Header" xml:space="preserve">
+    <value>环境色彩采样模式</value>
+  </data>
+  <data name="SettingsPageEnvColorSampleAbove.Content" xml:space="preserve">
+    <value>窗口上方</value>
+  </data>
+  <data name="SettingsPageEnvColorSampleBelow.Content" xml:space="preserve">
+    <value>窗口下方</value>
+  </data>
+  <data name="SettingsPageEnvColorSampleEdge.Content" xml:space="preserve">
+    <value>窗口边缘</value>
+  </data>
+  <data name="SettingsPageEnvColorSampleInner.Content" xml:space="preserve">
+    <value>窗口内部</value>
+  </data>
   <data name="SettingsPageExitOnLyricsWindowClosed.Header" xml:space="preserve">
     <value>关闭歌词窗口时退出程序</value>
   </data>
@@ -652,30 +703,30 @@
   <data name="SettingsPageFixedTimeStep.Header" xml:space="preserve">
     <value>固定时间步长渲染</value>
   </data>
+  <data name="SettingsPageFluidLayer.Header" xml:space="preserve">
+    <value>流体层</value>
+  </data>
   <data name="SettingsPageFollowSystem.Content" xml:space="preserve">
     <value>跟随系统</value>
   </data>
+  <data name="SettingsPageForceAlwaysOnTop.Description" xml:space="preserve">
+    <value>通过轮询方式使歌词窗口保持置于顶层状态</value>
+  </data>
+  <data name="SettingsPageForceAlwaysOnTop.Header" xml:space="preserve">
+    <value>强制置于顶层</value>
+  </data>
   <data name="SettingsPageFPS.Header" xml:space="preserve">
     <value>渲染帧率</value>
   </data>
-  <data name="SettingsPageGlobalDrag.Description" xml:space="preserve">
-    <value>将标题栏扩展至整个页面使得在任意非交互区域均可拖拽窗口</value>
-  </data>
-  <data name="SettingsPageGlobalDrag.Header" xml:space="preserve">
-    <value>全局拖拽</value>
+  <data name="SettingsPageFullscreenMode.Text" xml:space="preserve">
+    <value>全屏模式</value>
   </data>
   <data name="SettingsPageHideWindow.Description" xml:space="preserve">
-    <value>停靠模式或桌面模式下，无歌曲正在播放时，自动隐藏窗口；反之自动显示窗口</value>
+    <value>音乐未播放/播放时自动隐藏/显示歌词窗口</value>
   </data>
   <data name="SettingsPageHideWindow.Header" xml:space="preserve">
     <value>自动隐藏/显示窗口</value>
   </data>
-  <data name="SettingsPageIgnoreFullscreenWindow.Description" xml:space="preserve">
-    <value>当启用停靠模式或桌面模式时强制将本应用显示在全屏应用的上方</value>
-  </data>
-  <data name="SettingsPageIgnoreFullscreenWindow.Header" xml:space="preserve">
-    <value>始终显示在全屏应用上方</value>
-  </data>
   <data name="SettingsPageImportSettingsButton.Content" xml:space="preserve">
     <value>导入设置</value>
   </data>
@@ -727,14 +778,23 @@
   <data name="SettingsPageLastFMUsername.Header" xml:space="preserve">
     <value>用户名</value>
   </data>
+  <data name="SettingsPageLayoutOrientation.Header" xml:space="preserve">
+    <value>布局方向</value>
+  </data>
+  <data name="SettingsPageLayoutOrientationHorizontal.Content" xml:space="preserve">
+    <value>横向</value>
+  </data>
+  <data name="SettingsPageLayoutOrientationVertical.Content" xml:space="preserve">
+    <value>垂直</value>
+  </data>
   <data name="SettingsPageLibreTranslateServer.Header" xml:space="preserve">
     <value>服务器地址</value>
   </data>
   <data name="SettingsPageLight.Content" xml:space="preserve">
     <value>浅色</value>
   </data>
-  <data name="SettingsPageLockHotKey.Header" xml:space="preserve">
-    <value>解锁和锁定快捷键</value>
+  <data name="SettingsPageListenNewSession.Header" xml:space="preserve">
+    <value>启用对新播放源的监听</value>
   </data>
   <data name="SettingsPageLog.Header" xml:space="preserve">
     <value>日志记录</value>
@@ -742,7 +802,7 @@
   <data name="SettingsPageLXMusicServer.Text" xml:space="preserve">
     <value>LX 音乐服务器</value>
   </data>
-  <data name="SettingsPageLyrics.Content" xml:space="preserve">
+  <data name="SettingsPageLyrics.Text" xml:space="preserve">
     <value>歌词样式与动效</value>
   </data>
   <data name="SettingsPageLyricsAlignment.Header" xml:space="preserve">
@@ -751,15 +811,6 @@
   <data name="SettingsPageLyricsBackground.Header" xml:space="preserve">
     <value>歌词背景</value>
   </data>
-  <data name="SettingsPageLyricsBackgroundBlurAmount.Header" xml:space="preserve">
-    <value>专辑背景层模糊度</value>
-  </data>
-  <data name="SettingsPageLyricsBackgroundOpacity.Header" xml:space="preserve">
-    <value>专辑背景层不透明度</value>
-  </data>
-  <data name="SettingsPageLyricsBackgroundSpeed.Header" xml:space="preserve">
-    <value>专辑背景层运动速率</value>
-  </data>
   <data name="SettingsPageLyricsBgFontColor.Header" xml:space="preserve">
     <value>字体颜色（非当前播放区域）</value>
   </data>
@@ -859,9 +910,6 @@
   <data name="SettingsPageLyricsNormal.Content" xml:space="preserve">
     <value>常规</value>
   </data>
-  <data name="SettingsPageLyricsPureColorBgOpacity.Header" xml:space="preserve">
-    <value>纯色背景层不透明度</value>
-  </data>
   <data name="SettingsPageLyricsRendingScopeCurrentChar.Content" xml:space="preserve">
     <value>当前字符</value>
   </data>
@@ -913,9 +961,15 @@
   <data name="SettingsPageLyricsVerticalEdgeOpacity.Header" xml:space="preserve">
     <value>上下边缘不透明度</value>
   </data>
-  <data name="SettingsPageLyricsWindowManager.Header" xml:space="preserve">
+  <data name="SettingsPageLyricsWindowManager.Text" xml:space="preserve">
     <value>歌词窗口管理</value>
   </data>
+  <data name="SettingsPageLyricsWindowMgr.Content" xml:space="preserve">
+    <value>歌词窗口管理</value>
+  </data>
+  <data name="SettingsPageLyricsWindowSwitchHotKey.Header" xml:space="preserve">
+    <value>歌词窗口状态切换器快捷方式</value>
+  </data>
   <data name="SettingsPageMediaLib.Content" xml:space="preserve">
     <value>媒体库</value>
   </data>
@@ -940,13 +994,19 @@
   <data name="SettingsPageMusicLibRealTimeWatch.Header" xml:space="preserve">
     <value>实时监听文件变化</value>
   </data>
+  <data name="SettingsPageNarrowMode.Text" xml:space="preserve">
+    <value>窄屏模式</value>
+  </data>
   <data name="SettingsPageNextSongHotKey.Header" xml:space="preserve">
     <value>下一首曲目快捷键</value>
   </data>
   <data name="SettingsPageNoBackdrop.Content" xml:space="preserve">
     <value>无</value>
   </data>
-  <data name="SettingsPageOpenLogFolderButton.Content" xml:space="preserve">
+  <data name="SettingsPageOpacity.Header" xml:space="preserve">
+    <value>不透明度</value>
+  </data>
+  <data name="SettingsPageOpenFolderButton.Content" xml:space="preserve">
     <value>在文件资源管理器中打开</value>
   </data>
   <data name="SettingsPagePathBeIncludedInfo" xml:space="preserve">
@@ -982,9 +1042,15 @@
   <data name="SettingsPagePreviousSongHotKey.Header" xml:space="preserve">
     <value>上一首曲目快捷键</value>
   </data>
+  <data name="SettingsPagePureLayer.Header" xml:space="preserve">
+    <value>纯色层</value>
+  </data>
   <data name="SettingsPageQQGroup.Content" xml:space="preserve">
     <value>QQ 反馈交流群</value>
   </data>
+  <data name="SettingsPageRealtimeStatus.Text" xml:space="preserve">
+    <value>实时状态</value>
+  </data>
   <data name="SettingsPageRecord.Content" xml:space="preserve">
     <value>记录</value>
   </data>
@@ -1039,6 +1105,9 @@
   <data name="SettingsPageServerTestSuccessInfo" xml:space="preserve">
     <value>服务器测试成功</value>
   </data>
+  <data name="SettingsPageSettings.Header" xml:space="preserve">
+    <value>设置</value>
+  </data>
   <data name="SettingsPageSettingsManager.Header" xml:space="preserve">
     <value>设置管理器</value>
   </data>
@@ -1048,9 +1117,21 @@
   <data name="SettingsPageShortcutRegSuccessInfo" xml:space="preserve">
     <value>该热键已成功注册</value>
   </data>
+  <data name="SettingsPageShowArtists.Header" xml:space="preserve">
+    <value>显示艺术家</value>
+  </data>
   <data name="SettingsPageShowHideHotKey.Header" xml:space="preserve">
     <value>歌词窗口显示和隐藏快捷键</value>
   </data>
+  <data name="SettingsPageShowInSwitchers.Description" xml:space="preserve">
+    <value>例如：Alt + Tab，任务栏</value>
+  </data>
+  <data name="SettingsPageShowInSwitchers.Header" xml:space="preserve">
+    <value>在系统环境中显示</value>
+  </data>
+  <data name="SettingsPageShowTitle.Header" xml:space="preserve">
+    <value>显示标题</value>
+  </data>
   <data name="SettingsPageSliderPrefix.Text" xml:space="preserve">
     <value>当前值： </value>
   </data>
@@ -1069,6 +1150,15 @@
   <data name="SettingsPageSongInfoRight.Content" xml:space="preserve">
     <value>靠右</value>
   </data>
+  <data name="SettingsPageSpectrumLayer.Header" xml:space="preserve">
+    <value>频谱层</value>
+  </data>
+  <data name="SettingsPageSpeed.Header" xml:space="preserve">
+    <value>运动速率</value>
+  </data>
+  <data name="SettingsPageStandardMode.Text" xml:space="preserve">
+    <value>标准模式</value>
+  </data>
   <data name="SettingsPageSystemLanguage.Content" xml:space="preserve">
     <value>默认</value>
   </data>
@@ -1087,6 +1177,15 @@
   <data name="SettingsPageTitle" xml:space="preserve">
     <value>设置 - BetterLyrics</value>
   </data>
+  <data name="SettingsPageTitleBarAreaNone.Content" xml:space="preserve">
+    <value>无</value>
+  </data>
+  <data name="SettingsPageTitleBarAreaTop.Content" xml:space="preserve">
+    <value>顶部</value>
+  </data>
+  <data name="SettingsPageTitleBarAreaWhole.Content" xml:space="preserve">
+    <value>整个窗口</value>
+  </data>
   <data name="SettingsPageTitleBarType.Header" xml:space="preserve">
     <value>标题栏大小</value>
   </data>
@@ -1108,6 +1207,18 @@
   <data name="SettingsPageVersion.Text" xml:space="preserve">
     <value>版本号</value>
   </data>
+  <data name="SettingsPageWorkArea.Description" xml:space="preserve">
+    <value>作为一个独立的工作区域停靠在屏幕的上/下边缘</value>
+  </data>
+  <data name="SettingsPageWorkArea.Header" xml:space="preserve">
+    <value>工作区</value>
+  </data>
+  <data name="SettingsPageWorkAreaHeight.Header" xml:space="preserve">
+    <value>工作区高度</value>
+  </data>
+  <data name="StandardMode" xml:space="preserve">
+    <value>标准模式</value>
+  </data>
   <data name="SystemTrayExit.Text" xml:space="preserve">
     <value>退出程序</value>
   </data>
@@ -1129,9 +1240,6 @@
   <data name="SystemTraySettings.Text" xml:space="preserve">
     <value>打开设置</value>
   </data>
-  <data name="SystemTrayUnlock.Text" xml:space="preserve">
-    <value>解锁窗口</value>
-  </data>
   <data name="TranslateServerNotSet" xml:space="preserve">
     <value>未设置Translate服务器，请先在设置中进行配置</value>
   </data>

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

@@ -123,27 +123,12 @@
   <data name="AlbumArtSearchSMTCProvider" xml:space="preserve">
     <value>音樂播放器</value>
   </data>
-  <data name="AllLyricsSettingsControlDesktop.Content" xml:space="preserve">
-    <value>桌面模式</value>
-  </data>
-  <data name="AllLyricsSettingsControlDock.Content" xml:space="preserve">
-    <value>停靠模式</value>
-  </data>
   <data name="AllLyricsSettingsControlPictureInPicture.Content" xml:space="preserve">
     <value>畫中畫模式</value>
   </data>
-  <data name="AllLyricsSettingsControlStandard.Content" xml:space="preserve">
-    <value>標準模式</value>
-  </data>
-  <data name="AppSettingsControlGeneral.Content" xml:space="preserve">
+  <data name="AppSettingsControlGeneral.Text" xml:space="preserve">
     <value>一般</value>
   </data>
-  <data name="BaseWindowEnterFullScreenHint" xml:space="preserve">
-    <value>按 Esc 退出全螢幕模式</value>
-  </data>
-  <data name="BaseWindowFullScreenFlyoutItem.Text" xml:space="preserve">
-    <value>全螢幕</value>
-  </data>
   <data name="BaseWindowHostInfoBarCheckBox.Content" xml:space="preserve">
     <value>不再顯示此訊息</value>
   </data>
@@ -153,32 +138,38 @@
   <data name="Cancel" xml:space="preserve">
     <value>取消</value>
   </data>
+  <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>
+  <data name="DockedMode" xml:space="preserve">
+    <value>停靠模式</value>
+  </data>
   <data name="ExportSettingsSuccess" xml:space="preserve">
     <value>導出成功</value>
   </data>
   <data name="FailToStartLXMusicServer" xml:space="preserve">
     <value>無法連接到 LX 音樂服務器，請轉到設置 - 高級選項以檢查是否正確輸入鏈接</value>
   </data>
+  <data name="FullscreenMode" xml:space="preserve">
+    <value>全螢幕模式</value>
+  </data>
   <data name="HostWindowClickThroughButton.Content" xml:space="preserve">
     <value>鎖定</value>
   </data>
   <data name="HostWindowClickThroughFlyoutItem.Text" xml:space="preserve">
     <value>鎖定</value>
   </data>
-  <data name="HostWindowDesktopFlyoutItem.Text" xml:space="preserve">
-    <value>桌面模式</value>
-  </data>
-  <data name="HostWindowDockFlyoutItem.Text" xml:space="preserve">
-    <value>停靠模式</value>
-  </data>
   <data name="HostWindowLockToolTip.Text" xml:space="preserve">
     <value>鎖定</value>
   </data>
-  <data name="HostWindowMoreButtonToolTip.Content" xml:space="preserve">
-    <value>更多</value>
+  <data name="HostWindowMusicGalleryButtonToolTip.Content" xml:space="preserve">
+    <value>音樂庫</value>
   </data>
   <data name="HostWindowSettingsFlyoutItem.Text" xml:space="preserve">
     <value>設定</value>
@@ -223,7 +214,7 @@
     <value>手動檢索歌詞</value>
   </data>
   <data name="LyricsPageLyricsSettingsButtonToolTip.Content" xml:space="preserve">
-    <value>歌詞樣式與效果快捷設置</value>
+    <value>歌詞視窗管理快捷設定</value>
   </data>
   <data name="LyricsPagePlaybackSourceButtonToolTip.Content" xml:space="preserve">
     <value>播放源快捷設置</value>
@@ -303,11 +294,17 @@
   <data name="LyricsWindowImmersiveButtonToolTip.Content" xml:space="preserve">
     <value>沉浸模式</value>
   </data>
-  <data name="MainPageAlbumArtOnly.Content" xml:space="preserve">
-    <value>僅顯示專輯封面</value>
+  <data name="LyricsWindowSettingsControlCurrentLyricsWindowConfig.Text" xml:space="preserve">
+    <value>目前歌詞視窗設定</value>
   </data>
-  <data name="MainPageDesktopLyricsToggler.ToolTipService.ToolTip" xml:space="preserve">
-    <value>切換到桌面歌詞模式</value>
+  <data name="LyricsWindowSettingsControlLyricsWindowMode.Header" xml:space="preserve">
+    <value>歌詞視窗模式</value>
+  </data>
+  <data name="LyricsWindowSettingsControlSetDefault.Text" xml:space="preserve">
+    <value>設為預設</value>
+  </data>
+  <data name="MainPageAlbumArtOnly.Content" xml:space="preserve">
+    <value>僅限相簿藝術區域</value>
   </data>
   <data name="MainPageEnterImmersiveModeHint" xml:space="preserve">
     <value>再次懸停以顯示切換按鈕</value>
@@ -442,6 +439,12 @@
   <data name="MusicGalleryPageTitle" xml:space="preserve">
     <value>音樂庫 - BetterLyrics</value>
   </data>
+  <data name="NarrowMode" xml:space="preserve">
+    <value>窄螢幕模式</value>
+  </data>
+  <data name="PictureInPictureMode" xml:space="preserve">
+    <value>畫中畫模式</value>
+  </data>
   <data name="SetingsPageDonation.Text" xml:space="preserve">
     <value>捐贈</value>
   </data>
@@ -460,18 +463,33 @@
   <data name="SettingsPageAcrylicThin.Content" xml:space="preserve">
     <value>亞克力（薄層）</value>
   </data>
+  <data name="SettingsPageAdaptEnvColor.Description" xml:space="preserve">
+    <value>同時，將歌詞背景中的純色圖層不透明度和專輯藝術圖層不透明度設置為 0 ，以獲得正確的效果</value>
+  </data>
+  <data name="SettingsPageAdaptEnvColor.Header" xml:space="preserve">
+    <value>適應環境色彩</value>
+  </data>
   <data name="SettingsPageAddFolder.Header" xml:space="preserve">
     <value>新增資料夾</value>
   </data>
   <data name="SettingsPageAddFolderButton.Content" xml:space="preserve">
     <value>添加</value>
   </data>
+  <data name="SettingsPageAdvanced.Text" xml:space="preserve">
+    <value>高級選項</value>
+  </data>
   <data name="SettingsPageAlbumArt.Text" xml:space="preserve">
     <value>專輯</value>
   </data>
+  <data name="SettingsPageAlbumArtLayer.Header" xml:space="preserve">
+    <value>相簿藝術圖層</value>
+  </data>
   <data name="SettingsPageAlbumArtSearchProvidersConfig.Text" xml:space="preserve">
     <value>配置專輯封面源</value>
   </data>
+  <data name="SettingsPageAlbumArtSize.Header" xml:space="preserve">
+    <value>專輯封面</value>
+  </data>
   <data name="SettingsPageAlbumLib.Content" xml:space="preserve">
     <value>專輯封面來源</value>
   </data>
@@ -481,14 +499,14 @@
   <data name="SettingsPageAlbumShadowAmount.Header" xml:space="preserve">
     <value>陰影擴散程度</value>
   </data>
-  <data name="SettingsPageAlbumStyle.Content" xml:space="preserve">
+  <data name="SettingsPageAlbumStyle.Text" xml:space="preserve">
     <value>專輯區域樣式</value>
   </data>
   <data name="SettingsPageAmount.Header" xml:space="preserve">
     <value>量</value>
   </data>
   <data name="SettingsPageAOT.Header" xml:space="preserve">
-    <value>將應用置於頂層</value>
+    <value>將歌詞視窗置於頂層</value>
   </data>
   <data name="SettingsPageApp.Content" xml:space="preserve">
     <value>應用外觀與行為</value>
@@ -497,29 +515,17 @@
     <value>應用外觀</value>
   </data>
   <data name="SettingsPageAppBehavior.Text" xml:space="preserve">
-    <value>應用行為</value>
+    <value>一般行爲</value>
   </data>
   <data name="SettingsPageApply.Content" xml:space="preserve">
     <value>應用</value>
   </data>
-  <data name="SettingsPageAutoLock.Header" xml:space="preserve">
-    <value>啟動桌面模式時隨即鎖定窗口</value>
+  <data name="SettingsPageAutoSize.Header" xml:space="preserve">
+    <value>自動調整大小</value>
   </data>
   <data name="SettingsPageAutoStart.Header" xml:space="preserve">
     <value>自動啟動</value>
   </data>
-  <data name="SettingsPageAutoStartDesktopLyrics.Content" xml:space="preserve">
-    <value>啟動桌面模式</value>
-  </data>
-  <data name="SettingsPageAutoStartDockLyrics.Content" xml:space="preserve">
-    <value>啟動停靠模式</value>
-  </data>
-  <data name="SettingsPageAutoStartInAppLyrics.Content" xml:space="preserve">
-    <value>啟動標準模式</value>
-  </data>
-  <data name="SettingsPageAutoStartPIPLyrics.Content" xml:space="preserve">
-    <value>啟動畫中畫模式</value>
-  </data>
   <data name="SettingsPageAutoStartWindow.Header" xml:space="preserve">
     <value>啟動應用程式時</value>
   </data>
@@ -529,9 +535,18 @@
   <data name="SettingsPageBackgroundAcrylicEffectAmount.Header" xml:space="preserve">
     <value>專輯背景壓克力效果強度</value>
   </data>
-  <data name="SettingsPageBackgroundOverlay.Content" xml:space="preserve">
+  <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>
+  <data name="SettingsPageBorderlessHotKey.Header" xml:space="preserve">
+    <value>無邊框歌詞視窗捷徑</value>
+  </data>
   <data name="SettingsPageCache.Description" xml:space="preserve">
     <value>包括日誌文件，網絡歌詞緩存</value>
   </data>
@@ -544,9 +559,27 @@
   <data name="SettingsPageChinesePreference.Header" xml:space="preserve">
     <value>中文轉換為繁體</value>
   </data>
+  <data name="SettingsPageClickThrough.Header" xml:space="preserve">
+    <value>點擊穿透</value>
+  </data>
+  <data name="SettingsPageClickThroughHotKey.Header" xml:space="preserve">
+    <value>點選穿透快捷鍵</value>
+  </data>
   <data name="SettingsPageCompactTitleBar.Content" xml:space="preserve">
     <value>緊湊</value>
   </data>
+  <data name="SettingsPageConfigName.Description" xml:space="preserve">
+    <value>命名錄製的視窗狀態可以幫助您更好地區分它們</value>
+  </data>
+  <data name="SettingsPageConfigName.Header" xml:space="preserve">
+    <value>配置名稱</value>
+  </data>
+  <data name="SettingsPageCreateFromCurrent.Content" xml:space="preserve">
+    <value>從目前的歌詞視窗狀態建立</value>
+  </data>
+  <data name="SettingsPageCreateFromTemplates.Content" xml:space="preserve">
+    <value>從範本建立</value>
+  </data>
   <data name="SettingsPageCurrentLyricsWindowStatus.Text" xml:space="preserve">
     <value>當前歌詞窗口狀態</value>
   </data>
@@ -556,29 +589,29 @@
   <data name="SettingsPageDebugOverlay.Header" xml:space="preserve">
     <value>顯示調試覆蓋層</value>
   </data>
-  <data name="SettingsPageDelete.Content" xml:space="preserve">
+  <data name="SettingsPageDelete.Text" xml:space="preserve">
     <value>刪除</value>
   </data>
-  <data name="SettingsPageDesktopAcrylic.Content" xml:space="preserve">
-    <value>亞克力（桌面）</value>
+  <data name="SettingsPageDesktopMode.Text" xml:space="preserve">
+    <value>桌面模式（透明）</value>
   </data>
-  <data name="SettingsPageDev.Content" xml:space="preserve">
-    <value>高級選項</value>
-  </data>
-  <data name="SettingsPageDisclaimer.Text" xml:space="preserve">
+  <data name="SettingsPageDisclaimer.Message" xml:space="preserve">
     <value>本項目按原樣提供，不提供任何形式的保證。所有歌詞、字型、圖示和其他第三方資源均屬其各自的版權擁有者所有。此專案的作者並未聲明此類資源的所有權。此專案為非商業專案，不應用於侵犯任何權利。用戶有責任確保自己的使用符合適用的法律和許可證。</value>
   </data>
   <data name="SettingsPageDiscord.Content" xml:space="preserve">
     <value>Discord</value>
   </data>
   <data name="SettingsPageDisplayTypeSwitcher.Header" xml:space="preserve">
-    <value>歌詞專輯佈局模式</value>
+    <value>布局模式</value>
+  </data>
+  <data name="SettingsPageDockedMode.Text" xml:space="preserve">
+    <value>停靠模式</value>
   </data>
   <data name="SettingsPageDockMonitor.Header" xml:space="preserve">
     <value>目標顯示器</value>
   </data>
   <data name="SettingsPageDockPlacement.Header" xml:space="preserve">
-    <value>停靠模式位置</value>
+    <value>工作區域位置</value>
   </data>
   <data name="SettingsPageDockPlacementBottom.Content" xml:space="preserve">
     <value>底部</value>
@@ -589,6 +622,9 @@
   <data name="SettingsPageDockWindowHeight.Header" xml:space="preserve">
     <value>窗口高度</value>
   </data>
+  <data name="SettingsPageDragArea.Header" xml:space="preserve">
+    <value>拖動</value>
+  </data>
   <data name="SettingsPageDynamicLyricsFontSize.Header" xml:space="preserve">
     <value>自動調整</value>
   </data>
@@ -634,6 +670,21 @@
   <data name="SettingsPageEN.Content" xml:space="preserve">
     <value>English</value>
   </data>
+  <data name="SettingsPageEnvColorSample.Header" xml:space="preserve">
+    <value>環境色彩採樣模式</value>
+  </data>
+  <data name="SettingsPageEnvColorSampleAbove.Content" xml:space="preserve">
+    <value>視窗上方</value>
+  </data>
+  <data name="SettingsPageEnvColorSampleBelow.Content" xml:space="preserve">
+    <value>視窗下方</value>
+  </data>
+  <data name="SettingsPageEnvColorSampleEdge.Content" xml:space="preserve">
+    <value>視窗邊緣</value>
+  </data>
+  <data name="SettingsPageEnvColorSampleInner.Content" xml:space="preserve">
+    <value>視窗內部</value>
+  </data>
   <data name="SettingsPageExitOnLyricsWindowClosed.Header" xml:space="preserve">
     <value>關閉歌詞視窗時退出程式</value>
   </data>
@@ -652,30 +703,30 @@
   <data name="SettingsPageFixedTimeStep.Header" xml:space="preserve">
     <value>固定時間步長渲染</value>
   </data>
+  <data name="SettingsPageFluidLayer.Header" xml:space="preserve">
+    <value>流體層</value>
+  </data>
   <data name="SettingsPageFollowSystem.Content" xml:space="preserve">
     <value>跟隨系統</value>
   </data>
+  <data name="SettingsPageForceAlwaysOnTop.Description" xml:space="preserve">
+    <value>透過輪詢方式使歌詞視窗保持置於頂層狀態</value>
+  </data>
+  <data name="SettingsPageForceAlwaysOnTop.Header" xml:space="preserve">
+    <value>強制置於頂層</value>
+  </data>
   <data name="SettingsPageFPS.Header" xml:space="preserve">
     <value>渲染幀率</value>
   </data>
-  <data name="SettingsPageGlobalDrag.Description" xml:space="preserve">
-    <value>將標題列擴展至整個頁面使得在任意非互動區域均可拖曳窗口</value>
-  </data>
-  <data name="SettingsPageGlobalDrag.Header" xml:space="preserve">
-    <value>全域拖曳</value>
+  <data name="SettingsPageFullscreenMode.Text" xml:space="preserve">
+    <value>全螢幕模式</value>
   </data>
   <data name="SettingsPageHideWindow.Description" xml:space="preserve">
-    <value>停靠模式或桌面模式下，無歌曲正在播放時，自動隱藏窗口；反之自動顯示窗口</value>
+    <value>音樂未播放/播放時自動隱藏/顯示歌詞視窗</value>
   </data>
   <data name="SettingsPageHideWindow.Header" xml:space="preserve">
     <value>自動隱藏/顯示窗口</value>
   </data>
-  <data name="SettingsPageIgnoreFullscreenWindow.Description" xml:space="preserve">
-    <value>啟用停靠模式或桌面模式時強制將本應用程式顯示在全螢幕應用程式的上方</value>
-  </data>
-  <data name="SettingsPageIgnoreFullscreenWindow.Header" xml:space="preserve">
-    <value>始終顯示在全螢幕應用程式上方</value>
-  </data>
   <data name="SettingsPageImportSettingsButton.Content" xml:space="preserve">
     <value>導入設置</value>
   </data>
@@ -727,14 +778,23 @@
   <data name="SettingsPageLastFMUsername.Header" xml:space="preserve">
     <value>使用者名稱</value>
   </data>
+  <data name="SettingsPageLayoutOrientation.Header" xml:space="preserve">
+    <value>版面配置方向</value>
+  </data>
+  <data name="SettingsPageLayoutOrientationHorizontal.Content" xml:space="preserve">
+    <value>水平</value>
+  </data>
+  <data name="SettingsPageLayoutOrientationVertical.Content" xml:space="preserve">
+    <value>縱向</value>
+  </data>
   <data name="SettingsPageLibreTranslateServer.Header" xml:space="preserve">
     <value>服務器地址</value>
   </data>
   <data name="SettingsPageLight.Content" xml:space="preserve">
     <value>淺色</value>
   </data>
-  <data name="SettingsPageLockHotKey.Header" xml:space="preserve">
-    <value>解鎖和鎖定快捷鍵</value>
+  <data name="SettingsPageListenNewSession.Header" xml:space="preserve">
+    <value>啟用對新播放來源的監聽</value>
   </data>
   <data name="SettingsPageLog.Header" xml:space="preserve">
     <value>日誌記錄</value>
@@ -742,7 +802,7 @@
   <data name="SettingsPageLXMusicServer.Text" xml:space="preserve">
     <value>LX 音樂服務器</value>
   </data>
-  <data name="SettingsPageLyrics.Content" xml:space="preserve">
+  <data name="SettingsPageLyrics.Text" xml:space="preserve">
     <value>歌詞樣式與動效</value>
   </data>
   <data name="SettingsPageLyricsAlignment.Header" xml:space="preserve">
@@ -751,15 +811,6 @@
   <data name="SettingsPageLyricsBackground.Header" xml:space="preserve">
     <value>歌詞背景</value>
   </data>
-  <data name="SettingsPageLyricsBackgroundBlurAmount.Header" xml:space="preserve">
-    <value>專輯背景層模糊度</value>
-  </data>
-  <data name="SettingsPageLyricsBackgroundOpacity.Header" xml:space="preserve">
-    <value>專輯背景層不透明度</value>
-  </data>
-  <data name="SettingsPageLyricsBackgroundSpeed.Header" xml:space="preserve">
-    <value>專輯背景層運動速率</value>
-  </data>
   <data name="SettingsPageLyricsBgFontColor.Header" xml:space="preserve">
     <value>字體顏色（非當前播放區域）</value>
   </data>
@@ -859,9 +910,6 @@
   <data name="SettingsPageLyricsNormal.Content" xml:space="preserve">
     <value>常規</value>
   </data>
-  <data name="SettingsPageLyricsPureColorBgOpacity.Header" xml:space="preserve">
-    <value>純色背景層不透明度</value>
-  </data>
   <data name="SettingsPageLyricsRendingScopeCurrentChar.Content" xml:space="preserve">
     <value>目前字元</value>
   </data>
@@ -913,9 +961,15 @@
   <data name="SettingsPageLyricsVerticalEdgeOpacity.Header" xml:space="preserve">
     <value>上下邊緣不透明度</value>
   </data>
-  <data name="SettingsPageLyricsWindowManager.Header" xml:space="preserve">
+  <data name="SettingsPageLyricsWindowManager.Text" xml:space="preserve">
     <value>歌詞視窗管理</value>
   </data>
+  <data name="SettingsPageLyricsWindowMgr.Content" xml:space="preserve">
+    <value>歌詞視窗管理</value>
+  </data>
+  <data name="SettingsPageLyricsWindowSwitchHotKey.Header" xml:space="preserve">
+    <value>歌詞視窗狀態切換器捷徑</value>
+  </data>
   <data name="SettingsPageMediaLib.Content" xml:space="preserve">
     <value>媒體庫</value>
   </data>
@@ -940,13 +994,19 @@
   <data name="SettingsPageMusicLibRealTimeWatch.Header" xml:space="preserve">
     <value>實時監聽文件變化</value>
   </data>
+  <data name="SettingsPageNarrowMode.Text" xml:space="preserve">
+    <value>窄螢幕模式</value>
+  </data>
   <data name="SettingsPageNextSongHotKey.Header" xml:space="preserve">
     <value>下一首曲目快捷鍵</value>
   </data>
   <data name="SettingsPageNoBackdrop.Content" xml:space="preserve">
     <value>無</value>
   </data>
-  <data name="SettingsPageOpenLogFolderButton.Content" xml:space="preserve">
+  <data name="SettingsPageOpacity.Header" xml:space="preserve">
+    <value>專輯背景層不透明度</value>
+  </data>
+  <data name="SettingsPageOpenFolderButton.Content" xml:space="preserve">
     <value>在檔案總管中開啟</value>
   </data>
   <data name="SettingsPagePathBeIncludedInfo" xml:space="preserve">
@@ -982,9 +1042,15 @@
   <data name="SettingsPagePreviousSongHotKey.Header" xml:space="preserve">
     <value>上一首曲目快捷鍵</value>
   </data>
+  <data name="SettingsPagePureLayer.Header" xml:space="preserve">
+    <value>純淨的色彩層</value>
+  </data>
   <data name="SettingsPageQQGroup.Content" xml:space="preserve">
     <value>QQ 回饋交流群</value>
   </data>
+  <data name="SettingsPageRealtimeStatus.Text" xml:space="preserve">
+    <value>即時狀態</value>
+  </data>
   <data name="SettingsPageRecord.Content" xml:space="preserve">
     <value>記錄</value>
   </data>
@@ -1039,6 +1105,9 @@
   <data name="SettingsPageServerTestSuccessInfo" xml:space="preserve">
     <value>服務器測試成功</value>
   </data>
+  <data name="SettingsPageSettings.Header" xml:space="preserve">
+    <value>設定</value>
+  </data>
   <data name="SettingsPageSettingsManager.Header" xml:space="preserve">
     <value>設置管理器</value>
   </data>
@@ -1048,9 +1117,21 @@
   <data name="SettingsPageShortcutRegSuccessInfo" xml:space="preserve">
     <value>該熱鍵已成功註冊</value>
   </data>
+  <data name="SettingsPageShowArtists.Header" xml:space="preserve">
+    <value>界面設計</value>
+  </data>
   <data name="SettingsPageShowHideHotKey.Header" xml:space="preserve">
     <value>歌詞窗口顯示和隱藏快捷鍵</value>
   </data>
+  <data name="SettingsPageShowInSwitchers.Description" xml:space="preserve">
+    <value>例如：Alt + Tab，任務列</value>
+  </data>
+  <data name="SettingsPageShowInSwitchers.Header" xml:space="preserve">
+    <value>在系統環境中顯示</value>
+  </data>
+  <data name="SettingsPageShowTitle.Header" xml:space="preserve">
+    <value>顯示標題</value>
+  </data>
   <data name="SettingsPageSliderPrefix.Text" xml:space="preserve">
     <value>目前值： </value>
   </data>
@@ -1069,6 +1150,15 @@
   <data name="SettingsPageSongInfoRight.Content" xml:space="preserve">
     <value>靠右</value>
   </data>
+  <data name="SettingsPageSpectrumLayer.Header" xml:space="preserve">
+    <value>光譜層</value>
+  </data>
+  <data name="SettingsPageSpeed.Header" xml:space="preserve">
+    <value>動作速率</value>
+  </data>
+  <data name="SettingsPageStandardMode.Text" xml:space="preserve">
+    <value>標準模式</value>
+  </data>
   <data name="SettingsPageSystemLanguage.Content" xml:space="preserve">
     <value>預設</value>
   </data>
@@ -1087,6 +1177,15 @@
   <data name="SettingsPageTitle" xml:space="preserve">
     <value>設定 - BetterLyrics</value>
   </data>
+  <data name="SettingsPageTitleBarAreaNone.Content" xml:space="preserve">
+    <value>無</value>
+  </data>
+  <data name="SettingsPageTitleBarAreaTop.Content" xml:space="preserve">
+    <value>頂部</value>
+  </data>
+  <data name="SettingsPageTitleBarAreaWhole.Content" xml:space="preserve">
+    <value>整個視窗</value>
+  </data>
   <data name="SettingsPageTitleBarType.Header" xml:space="preserve">
     <value>標題列大小</value>
   </data>
@@ -1108,6 +1207,18 @@
   <data name="SettingsPageVersion.Text" xml:space="preserve">
     <value>版本號</value>
   </data>
+  <data name="SettingsPageWorkArea.Description" xml:space="preserve">
+    <value>作為一個獨立的工作區域停靠在螢幕的上/下邊緣</value>
+  </data>
+  <data name="SettingsPageWorkArea.Header" xml:space="preserve">
+    <value>工作區區域</value>
+  </data>
+  <data name="SettingsPageWorkAreaHeight.Header" xml:space="preserve">
+    <value>工作區域高度</value>
+  </data>
+  <data name="StandardMode" xml:space="preserve">
+    <value>標準模式</value>
+  </data>
   <data name="SystemTrayExit.Text" xml:space="preserve">
     <value>退出程序</value>
   </data>
@@ -1129,9 +1240,6 @@
   <data name="SystemTraySettings.Text" xml:space="preserve">
     <value>打開設置</value>
   </data>
-  <data name="SystemTrayUnlock.Text" xml:space="preserve">
-    <value>解鎖窗口</value>
-  </data>
   <data name="TranslateServerNotSet" xml:space="preserve">
     <value>未設定翻譯伺服器，請先在設定中進行配置</value>
   </data>

BetterLyrics.WinUI3/BetterLyrics.WinUI3/ViewModels/AlbumArtLayoutSettingsControlViewModel.cs

@@ -1,25 +0,0 @@
-using BetterLyrics.WinUI3.Models.Settings;
-using BetterLyrics.WinUI3.Services.SettingsService;
-using CommunityToolkit.Mvvm.ComponentModel;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace BetterLyrics.WinUI3.ViewModels
-{
-    public partial class AlbumArtLayoutSettingsControlViewModel : BaseViewModel
-    {
-        private readonly ISettingsService _settingsService;
-
-        [ObservableProperty]
-        public partial AppSettings AppSettings { get; set; }
-
-        public AlbumArtLayoutSettingsControlViewModel(ISettingsService settingsService)
-        {
-            _settingsService = settingsService;
-            AppSettings = _settingsService.AppSettings;
-        }
-    }
-}

BetterLyrics.WinUI3/BetterLyrics.WinUI3/ViewModels/AllLyricsSettingsControlViewModel.cs

@@ -1,46 +0,0 @@
-using BetterLyrics.WinUI3.Enums;
-using BetterLyrics.WinUI3.Models;
-using BetterLyrics.WinUI3.Models.Settings;
-using BetterLyrics.WinUI3.Services.LiveStatesService;
-using BetterLyrics.WinUI3.Services.SettingsService;
-using CommunityToolkit.Mvvm.ComponentModel;
-using CommunityToolkit.Mvvm.Messaging;
-using CommunityToolkit.Mvvm.Messaging.Messages;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace BetterLyrics.WinUI3.ViewModels
-{
-    public partial class AllLyricsSettingsControlViewModel : BaseViewModel, 
-        IRecipient<PropertyChangedMessage<LyricsWindowMode>>
-    {
-        private readonly ISettingsService _settingsService;
-
-        [ObservableProperty]
-        public partial AppSettings AppSettings { get; set; }
-
-        [ObservableProperty]
-        public partial int SelectedTabIndex { get; set; } = 0;
-
-        public AllLyricsSettingsControlViewModel(ISettingsService settingsService)
-        {
-            _settingsService = settingsService;
-
-            AppSettings = _settingsService.AppSettings;
-        }
-
-        public void Receive(PropertyChangedMessage<LyricsWindowMode> message)
-        {
-            if (message.Sender is LiveStates)
-            {
-                if (message.PropertyName == nameof(LiveStates.LyricsWindowMode))
-                {
-                    SelectedTabIndex = (int)message.NewValue;
-                }
-            }
-        }
-    }
-}

BetterLyrics.WinUI3/BetterLyrics.WinUI3/ViewModels/AppSettingsControlViewModel.cs

@@ -15,25 +15,14 @@ namespace BetterLyrics.WinUI3.ViewModels
     public partial class AppSettingsControlViewModel : BaseViewModel
     {
         private readonly ISettingsService _settingsService;
-        private readonly ILiveStatesService _liveStatesService;
 
         [ObservableProperty]
         public partial AppSettings AppSettings { get; set; }
 
-        [ObservableProperty]
-        public partial LiveStates LiveStates { get; set; }
-
-        [ObservableProperty]
-        public partial ObservableCollection<string> MonitorDeviceNames { get; set; }
-
-
-        public AppSettingsControlViewModel(ISettingsService settingsService, ILiveStatesService liveStatesService)
+        public AppSettingsControlViewModel(ISettingsService settingsService)
         {
             _settingsService = settingsService;
-            _liveStatesService = liveStatesService;
-            MonitorDeviceNames = [.. MonitorHelper.GetAllMonitorDeviceNames()];
             AppSettings = _settingsService.AppSettings;
-            LiveStates = _liveStatesService.LiveStates;
         }
 
         [RelayCommand]
@@ -42,26 +31,6 @@ namespace BetterLyrics.WinUI3.ViewModels
             WindowHelper.RestartApp();
         }
 
-        [RelayCommand]
-        private void RefreshMonitorDeviceNames()
-        {
-            MonitorDeviceNames = [.. MonitorHelper.GetAllMonitorDeviceNames()];
-            AppSettings.DockModeSettings.DockMonitorDeviceName = MonitorHelper.GetPrimaryMonitorDeviceName();
-        }
-
-        [RelayCommand]
-        private void RecordCurrentWindowBounds()
-        {
-            AppSettings.WindowBoundsRecords.Add(new WindowBoundsRecord
-            {
-                WindowBounds = LiveStates.LyricsWindowBounds,
-                MonitorDeviceName = LiveStates.LyricsWindowMonitorName,
-                MonitorBounds = LiveStates.LyricsWindowMonitorBounds,
-                DemoWindowBounds = LiveStates.DemoLyricsWindowBounds,
-                DemoMonitorBounds = LiveStates.DemoLyricsWindowMonitorBounds
-            });
-        }
-
         public async Task<bool> ToggleAutoStartupAsync(bool target)
         {
             StartupTask startupTask = await StartupTask.GetAsync(Constants.App.AutoStartupTaskId);

BetterLyrics.WinUI3/BetterLyrics.WinUI3/ViewModels/LyricsBackgroundSettingsControlViewModel.cs

@@ -1,25 +0,0 @@
-using BetterLyrics.WinUI3.Models.Settings;
-using BetterLyrics.WinUI3.Services.SettingsService;
-using CommunityToolkit.Mvvm.ComponentModel;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace BetterLyrics.WinUI3.ViewModels
-{
-    public partial class LyricsBackgroundSettingsControlViewModel : BaseViewModel
-    {
-        private readonly ISettingsService _settingsService;
-
-        [ObservableProperty]
-        public partial AppSettings AppSettings { get; set; }
-
-        public LyricsBackgroundSettingsControlViewModel(ISettingsService settingsService)
-        {
-            _settingsService = settingsService;
-            AppSettings = _settingsService.AppSettings;
-        }
-    }
-}

BetterLyrics.WinUI3/BetterLyrics.WinUI3/ViewModels/LyricsPageViewModel.cs

@@ -125,7 +125,7 @@ namespace BetterLyrics.WinUI3.ViewModels
         [RelayCommand]
         private static void OpenSettingsWindow()
         {
-            WindowHelper.OpenWindow<SettingsWindow>();
+            WindowHelper.OpenOrShowWindow<SettingsWindow>();
         }
 
         [RelayCommand]

BetterLyrics.WinUI3/BetterLyrics.WinUI3/ViewModels/LyricsRendererViewModel/LyricsRendererViewModel.CreateResources .cs

@@ -0,0 +1,37 @@
+using BetterLyrics.WinUI3.Helper;
+using CommunityToolkit.WinUI;
+using Microsoft.Graphics.Canvas;
+using Microsoft.Graphics.Canvas.Effects;
+using Microsoft.UI;
+using Microsoft.UI.Xaml.Controls;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Runtime.InteropServices.WindowsRuntime;
+using System.Text;
+using System.Threading.Tasks;
+using Windows.Storage;
+using Windows.Storage.Streams;
+
+namespace BetterLyrics.WinUI3.ViewModels.LyricsRendererViewModel
+{
+    public partial class LyricsRendererViewModel
+    {
+        private PixelShaderEffect? _effect;
+
+        public async Task CreateResourcesAsync(Microsoft.Graphics.Canvas.UI.Xaml.CanvasAnimatedControl control)
+        {
+            StorageFile file = await StorageFile.GetFileFromApplicationUriAsync(new Uri("ms-appx:///Assets/effect.bin"));
+            IBuffer buffer = await FileIO.ReadBufferAsync(file);
+            var bytes = buffer.ToArray();
+            _effect = new PixelShaderEffect(bytes);
+            _effect.Properties["Width"] = Convert.ToSingle(control.ConvertDipsToPixels((float)control.Size.Width, CanvasDpiRounding.Round));
+            _effect.Properties["Height"] = Convert.ToSingle(control.ConvertDipsToPixels((float)control.Size.Height, CanvasDpiRounding.Round));
+            _effect.Properties["color1"] = Colors.Black.ToVector3RGB();
+            _effect.Properties["color2"] = Colors.Black.ToVector3RGB();
+            _effect.Properties["color3"] = Colors.Black.ToVector3RGB();
+            _effect.Properties["color4"] = Colors.Black.ToVector3RGB();
+            _effect.Properties["EnableLightWave"] = false;
+        }
+    }
+}

BetterLyrics.WinUI3/BetterLyrics.WinUI3/ViewModels/LyricsRendererViewModel/LyricsRendererViewModel.Draw.cs

@@ -1,5 +1,7 @@
 using BetterLyrics.WinUI3.Enums;
 using BetterLyrics.WinUI3.Helper;
+using CommunityToolkit.WinUI;
+using Hqub.Lastfm;
 using Microsoft.Graphics.Canvas;
 using Microsoft.Graphics.Canvas.Brushes;
 using Microsoft.Graphics.Canvas.Effects;
@@ -33,24 +35,22 @@ namespace BetterLyrics.WinUI3.ViewModels.LyricsRendererViewModel
             using var combined = new CanvasCommandList(control);
             using var combinedDs = combined.CreateDrawingSession();
 
-            switch (_liveStatesService.LiveStates.LyricsWindowMode)
+            if (_liveStatesService.LiveStates.LyricsWindowStatus.LyricsBackgroundSettings.IsPureColorOverlayEnabled)
             {
-                case LyricsWindowMode.DockMode:
+                if (_liveStatesService.LiveStates.LyricsWindowStatus.IsAdaptToEnvironment)
+                {
                     FillBackground(control, combinedDs, _immersiveBgColorTransition.Value, 0f,
-                        _immersiveBgOpacityTransition.Value * _settingsService.AppSettings.LyricsBackgroundSettings.PureColorOverlayOpacity / 100f);
-                    break;
-                case LyricsWindowMode.DesktopMode:
-                    FillBackground(control, combinedDs, _immersiveBgColorTransition.Value, 0f,
-                        _immersiveBgOpacityTransition.Value * _settingsService.AppSettings.LyricsBackgroundSettings.PureColorOverlayOpacity / 100f);
-                    break;
-                case LyricsWindowMode.StandardMode:
-                case LyricsWindowMode.PictureInPictureMode:
-                    FillBackground(control, combinedDs, _albumArtAccentColorTransition.Value, 0f, _settingsService.AppSettings.LyricsBackgroundSettings.PureColorOverlayOpacity / 100.0);
-                    DrawAlbumArtBackground(control, combinedDs);
-                    break;
-                default:
-                    break;
+                        _immersiveBgOpacityTransition.Value * _liveStatesService.LiveStates.LyricsWindowStatus.LyricsBackgroundSettings.PureColorOverlayOpacity / 100f);
+                }
+                else
+                {
+                    FillBackground(control, combinedDs, _albumArtAccentColor1Transition.Value, 0f,
+                        _liveStatesService.LiveStates.LyricsWindowStatus.LyricsBackgroundSettings.PureColorOverlayOpacity / 100.0);
+                }
             }
+            DrawAlbumArtBackground(control, combinedDs);
+            DrawFluidBackground(control, combinedDs);
+            DrawSpectrum(control, combinedDs);
 
             combinedDs.DrawImage(blurredLyrics);
 
@@ -102,6 +102,88 @@ namespace BetterLyrics.WinUI3.ViewModels.LyricsRendererViewModel
             }
         }
 
+        public void DrawSpectrum(ICanvasAnimatedControl control, CanvasDrawingSession ds)
+        {
+            if (_spectrumAnalyzer != null && _liveStatesService.LiveStates.LyricsWindowStatus.LyricsBackgroundSettings.IsSpectrumOverlayEnabled)
+            {
+                var points = new Vector2[_spectrumAnalyzer.BarCount];
+                float pointSpacing = 0;
+
+                if (_spectrumAnalyzer.BarCount > 1)
+                {
+                    pointSpacing = (float)_canvasWidth / (_spectrumAnalyzer.BarCount - 1);
+                }
+
+                for (int i = 0; i < _spectrumAnalyzer.BarCount; i++)
+                {
+                    float x = i * pointSpacing;
+                    float amplitude = _spectrumAnalyzer.SmoothSpectrum.Average() * 10 + _spectrumAnalyzer.SmoothSpectrum[i] * 0.5f;
+                    float y = (float)_canvasHeight - amplitude;
+                    points[i] = new Vector2(x, y);
+                }
+
+                // 用于填充的闭合路径
+                using var pathBuilder = new CanvasPathBuilder(ds);
+                pathBuilder.BeginFigure(points[0]);
+
+                if (_spectrumAnalyzer.BarCount > 2)
+                {
+                    for (int i = 0; i < _spectrumAnalyzer.BarCount - 1; i++)
+                    {
+                        Vector2 p0 = points[Math.Max(i - 1, 0)];
+                        Vector2 p1 = points[i];
+                        Vector2 p2 = points[i + 1];
+                        Vector2 p3 = points[Math.Min(i + 2, _spectrumAnalyzer.BarCount - 1)];
+
+                        Vector2 cp1 = p1 + (p2 - p0) / 6.0f;
+                        Vector2 cp2 = p2 - (p3 - p1) / 6.0f;
+
+                        pathBuilder.AddCubicBezier(cp1, cp2, p2);
+                    }
+                }
+                else
+                {
+                    pathBuilder.AddLine(points[1]);
+                }
+
+                pathBuilder.AddLine(new Vector2(points[_spectrumAnalyzer.BarCount - 1].X, (float)_canvasHeight));
+                pathBuilder.AddLine(new Vector2(points[0].X, (float)_canvasHeight));
+                pathBuilder.EndFigure(CanvasFigureLoop.Closed);
+
+                using var geometry = CanvasGeometry.CreatePath(pathBuilder);
+                var gradientStops = new CanvasGradientStop[]
+                {
+                    new() { Position = 0.0f, Color = _albumArtAccentColor1Transition.Value },
+                    new() { Position = 1.0f, Color = Colors.Transparent }
+                };
+
+                using var gradientBrush = new CanvasLinearGradientBrush(ds, gradientStops);
+                gradientBrush.StartPoint = new Vector2((float)_canvasWidth / 2, (float)_canvasHeight);
+                gradientBrush.EndPoint = new Vector2((float)_canvasWidth / 2, points.Select(p => p.Y).Min());
+
+                // 使用渐变画刷填充
+                ds.FillGeometry(geometry, gradientBrush);
+
+                // 绘制轮廓线
+                // var lineColor = Colors.SkyBlue;
+                // float strokeWidth = 2f;
+                // session.DrawGeometry(geometry, lineColor, strokeWidth);
+
+            }
+        }
+
+        private void DrawFluidBackground(ICanvasAnimatedControl control, CanvasDrawingSession ds)
+        {
+            if (_effect != null && _liveStatesService.LiveStates.LyricsWindowStatus.LyricsBackgroundSettings.IsFluidOverlayEnabled)
+            {
+                ds.DrawImage(new OpacityEffect
+                {
+                    Source = _effect,
+                    Opacity = _liveStatesService.LiveStates.LyricsWindowStatus.LyricsBackgroundSettings.FluidOverlayOpacity / 100f
+                });
+            }
+        }
+
         private void DrawBackgroundImgae(OpacityEffect effect, CanvasDrawingSession ds, CanvasBitmap canvasBitmap)
         {
             double imageWidth = (double)canvasBitmap.Size.Width;
@@ -118,22 +200,25 @@ namespace BetterLyrics.WinUI3.ViewModels.LyricsRendererViewModel
 
         private void DrawAlbumArtBackground(ICanvasAnimatedControl control, CanvasDrawingSession ds)
         {
-            ds.Transform = Matrix3x2.CreateRotation((float)_rotateAngle, control.Size.ToVector2() * 0.5f);
-
-            if (_albumArtBgEffect != null)
+            if (_liveStatesService.LiveStates.LyricsWindowStatus.LyricsBackgroundSettings.IsCoverOverlayEnabled)
             {
-                ds.DrawImage(_albumArtBgEffect);
-            }
-            else if (_albumArtBgRenderTarget != null)
-            {
-                double targetSize = Math.Sqrt(Math.Pow(_canvasWidth, 2) + Math.Pow(_canvasHeight, 2));
-                float offsetX = (float)(_canvasWidth - targetSize) / 2;
-                float offsetY = (float)(_canvasHeight - targetSize) / 2;
+                ds.Transform = Matrix3x2.CreateRotation((float)_rotateAngle, control.Size.ToVector2() * 0.5f);
 
-                ds.DrawImage(_albumArtBgRenderTarget, new Vector2(offsetX, offsetY));
-            }
+                if (_albumArtBgEffect != null)
+                {
+                    ds.DrawImage(_albumArtBgEffect);
+                }
+                else if (_albumArtBgRenderTarget != null)
+                {
+                    double targetSize = Math.Sqrt(Math.Pow(_canvasWidth, 2) + Math.Pow(_canvasHeight, 2));
+                    float offsetX = (float)(_canvasWidth - targetSize) / 2;
+                    float offsetY = (float)(_canvasHeight - targetSize) / 2;
 
-            ds.Transform = Matrix3x2.Identity;
+                    ds.DrawImage(_albumArtBgRenderTarget, new Vector2(offsetX, offsetY));
+                }
+
+                ds.Transform = Matrix3x2.Identity;
+            }
         }
 
         private void DrawAlbumArt(ICanvasAnimatedControl control, CanvasDrawingSession ds)
@@ -172,7 +257,7 @@ namespace BetterLyrics.WinUI3.ViewModels.LyricsRendererViewModel
 
         private void DrawSingleTitleAndArtist(ICanvasAnimatedControl control, CanvasDrawingSession ds, string? title, string? artist, double opacity)
         {
-            var maxWidth = _lyricsLayoutOrientation switch
+            var maxWidth = _liveStatesService.LiveStates.LyricsWindowStatus.LyricsLayoutOrientation switch
             {
                 LyricsLayoutOrientation.Horizontal => _albumArtSize,
                 LyricsLayoutOrientation.Vertical => _canvasWidth - _leftMargin - _albumArtSize - _rightMargin,
@@ -191,14 +276,22 @@ namespace BetterLyrics.WinUI3.ViewModels.LyricsRendererViewModel
                 control, artist ?? string.Empty,
                 _artistTextFormat, (float)maxWidth, (float)_canvasHeight
             );
-            ds.DrawTextLayout(
-                titleLayout,
-                new Vector2((float)_titleXTransition.Value, (float)_titleYTransition.Value),
-                _bgFontColor.WithAlpha((byte)(_albumArtOpacityTransition.Value * 255 * opacity)));
-            ds.DrawTextLayout(
-                artistLayout,
-                new Vector2((float)_titleXTransition.Value, (float)(_titleYTransition.Value + titleLayout.LayoutBounds.Height)),
-                _bgFontColor.WithAlpha((byte)(_albumArtOpacityTransition.Value * 128 * opacity)));
+
+            if (_liveStatesService.LiveStates.LyricsWindowStatus.AlbumArtLayoutSettings.ShowTitle)
+            {
+                ds.DrawTextLayout(
+                    titleLayout,
+                    new Vector2((float)_titleXTransition.Value, (float)_titleYTransition.Value),
+                    _bgFontColor.WithAlpha((byte)(_albumArtOpacityTransition.Value * 255 * opacity)));
+
+                if (_liveStatesService.LiveStates.LyricsWindowStatus.AlbumArtLayoutSettings.ShowArtists)
+                {
+                    ds.DrawTextLayout(
+                        artistLayout,
+                        new Vector2((float)_titleXTransition.Value, (float)(_titleYTransition.Value + titleLayout.LayoutBounds.Height)),
+                        _bgFontColor.WithAlpha((byte)(_albumArtOpacityTransition.Value * 128 * opacity)));
+                }
+            }
         }
 
         private void DrawBlurredLyrics(ICanvasAnimatedControl control, CanvasDrawingSession ds)
@@ -236,7 +329,7 @@ namespace BetterLyrics.WinUI3.ViewModels.LyricsRendererViewModel
 
                 // 先铺一层带默认透明度的已经加了模糊效果的歌词作为最底层（背景歌词层次）
                 using var backgroundFontEffect = CanvasHelper.CreateFontEffect(line, control, _strokeFontColor,
-                    _liveStatesService.LiveStates.LyricsStyleSettings.LyricsFontStrokeWidth, _bgFontColor);
+                    _liveStatesService.LiveStates.LyricsWindowStatus.LyricsStyleSettings.LyricsFontStrokeWidth, _bgFontColor);
                 using var backgroundEffect = CanvasHelper.CreateBackgroundEffect(line, backgroundFontEffect, _lyricsOpacityTransition.Value);
                 combinedDs.DrawImage(backgroundEffect);
 
@@ -247,43 +340,43 @@ namespace BetterLyrics.WinUI3.ViewModels.LyricsRendererViewModel
 
                     using var charMask = CanvasHelper.CreateCharMask(control, line, charStartIndex, charLength, charProgress);
                     using var lineStartToCharMask = CanvasHelper.CreateLineStartToCharMask(control, line, charStartIndex, charLength, charProgress,
-                        _liveStatesService.LiveStates.LyricsEffectSettings.IsLyricsLineFadeEnabled);
+                        _liveStatesService.LiveStates.LyricsWindowStatus.LyricsEffectSettings.IsLyricsLineFadeEnabled);
                     using var lineMask = CanvasHelper.CreateLineMask(control, line);
 
                     using var foregroundFontEffect = CanvasHelper.CreateFontEffect(line, control, _strokeFontColor,
-                        _liveStatesService.LiveStates.LyricsStyleSettings.LyricsFontStrokeWidth, _fgFontColor);
+                        _liveStatesService.LiveStates.LyricsWindowStatus.LyricsStyleSettings.LyricsFontStrokeWidth, _fgFontColor);
 
                     using var effectLayer = new CanvasCommandList(control);
                     using var effectLayerDs = effectLayer.CreateDrawingSession();
-                    if (line.OriginalText != line.DisplayedText && _liveStatesService.LiveStates.LyricsEffectSettings.LyricsTranslationHighlightAmount != 0)
+                    if (line.OriginalText != line.DisplayedText && _liveStatesService.LiveStates.LyricsWindowStatus.LyricsEffectSettings.LyricsTranslationHighlightAmount != 0)
                     {
                         using var translationHighlightMask = CanvasHelper.CreateTranslationHighlightMask(control, line);
                         using var foregroundTranslationHighlightEffect = CanvasHelper.CreateForegroundHighlightEffect(foregroundFontEffect, translationHighlightMask,
-                            _liveStatesService.LiveStates.LyricsEffectSettings.LyricsTranslationHighlightAmount / 100.0);
+                            _liveStatesService.LiveStates.LyricsWindowStatus.LyricsEffectSettings.LyricsTranslationHighlightAmount / 100.0);
                         effectLayerDs.DrawImage(foregroundTranslationHighlightEffect);
                     }
-                    if (_liveStatesService.LiveStates.LyricsEffectSettings.IsLyricsShadowEnabled)
+                    if (_liveStatesService.LiveStates.LyricsWindowStatus.LyricsEffectSettings.IsLyricsShadowEnabled)
                     {
                         var shadowEffectMask = CanvasHelper.GetAlphaMask(control, charMask, lineStartToCharMask, lineMask,
-                            _liveStatesService.LiveStates.LyricsEffectSettings.LyricsShadowScope);
+                            _liveStatesService.LiveStates.LyricsWindowStatus.LyricsEffectSettings.LyricsShadowScope);
                         using var foregroundShadowEffect = CanvasHelper.CreateForegroundShadowEffect(foregroundFontEffect, shadowEffectMask,
-                            _albumArtAccentColorTransition.Value, _liveStatesService.LiveStates.LyricsEffectSettings.LyricsShadowAmount);
+                            _albumArtAccentColor1Transition.Value, _liveStatesService.LiveStates.LyricsWindowStatus.LyricsEffectSettings.LyricsShadowAmount);
                         effectLayerDs.DrawImage(foregroundShadowEffect);
                     }
-                    if (_liveStatesService.LiveStates.LyricsEffectSettings.IsLyricsGlowEffectEnabled)
+                    if (_liveStatesService.LiveStates.LyricsWindowStatus.LyricsEffectSettings.IsLyricsGlowEffectEnabled)
                     {
                         var blurEffectMask = CanvasHelper.GetAlphaMask(control, charMask, lineStartToCharMask, lineMask,
-                            _liveStatesService.LiveStates.LyricsEffectSettings.LyricsGlowEffectScope);
+                            _liveStatesService.LiveStates.LyricsWindowStatus.LyricsEffectSettings.LyricsGlowEffectScope);
                         using var foregroundBlurEffect = CanvasHelper.CreateForegroundBlurEffect(foregroundFontEffect, blurEffectMask,
-                            _liveStatesService.LiveStates.LyricsEffectSettings.LyricsGlowEffectAmount);
+                            _liveStatesService.LiveStates.LyricsWindowStatus.LyricsEffectSettings.LyricsGlowEffectAmount);
                         effectLayerDs.DrawImage(foregroundBlurEffect);
                     }
-                    if (_liveStatesService.LiveStates.LyricsEffectSettings.LyricsHighlightAmount != 0)
+                    if (_liveStatesService.LiveStates.LyricsWindowStatus.LyricsEffectSettings.LyricsHighlightAmount != 0)
                     {
                         var highlightEffectMask = CanvasHelper.GetAlphaMask(control, charMask, lineStartToCharMask, lineMask,
-                            _liveStatesService.LiveStates.LyricsEffectSettings.LyricsHighlightScope);
+                            _liveStatesService.LiveStates.LyricsWindowStatus.LyricsEffectSettings.LyricsHighlightScope);
                         using var foregroundHighlightEffect = CanvasHelper.CreateForegroundHighlightEffect(foregroundFontEffect, highlightEffectMask,
-                            _liveStatesService.LiveStates.LyricsEffectSettings.LyricsHighlightAmount / 100.0);
+                            _liveStatesService.LiveStates.LyricsWindowStatus.LyricsEffectSettings.LyricsHighlightAmount / 100.0);
                         effectLayerDs.DrawImage(foregroundHighlightEffect);
                     }
 
@@ -295,7 +388,7 @@ namespace BetterLyrics.WinUI3.ViewModels.LyricsRendererViewModel
 
                     if (i == _playingLineIndex)
                     {
-                        if (_liveStatesService.LiveStates.LyricsEffectSettings.IsLyricsFloatAnimationEnabled)
+                        if (_liveStatesService.LiveStates.LyricsWindowStatus.LyricsEffectSettings.IsLyricsFloatAnimationEnabled)
                         {
                             ds.DrawImage(new DisplacementMapEffect
                             {
@@ -303,7 +396,7 @@ namespace BetterLyrics.WinUI3.ViewModels.LyricsRendererViewModel
                                 Displacement = lineStartToCharMask,
                                 XChannelSelect = EffectChannelSelect.Red,
                                 YChannelSelect = EffectChannelSelect.Alpha,
-                                Amount = _liveStatesService.LiveStates.LyricsEffectSettings.LyricsFloatAmount,
+                                Amount = _liveStatesService.LiveStates.LyricsWindowStatus.LyricsEffectSettings.LyricsFloatAmount,
                             });
                         }
                         else

BetterLyrics.WinUI3/BetterLyrics.WinUI3/ViewModels/LyricsRendererViewModel/LyricsRendererViewModel.Effects.cs

@@ -56,7 +56,7 @@ namespace BetterLyrics.WinUI3.ViewModels.LyricsRendererViewModel
             double scaleFactor = _albumArtSize / Math.Min(imageWidth, imageHeight);
             if (scaleFactor < 0.01f) return null;
 
-            double cornerRadius = _settingsService.AppSettings.AlbumArtLayoutSettings.CoverImageRadius / 100f * _albumArtSize / 2;
+            double cornerRadius = _liveStatesService.LiveStates.LyricsWindowStatus.AlbumArtLayoutSettings.CoverImageRadius / 100f * _albumArtSize / 2;
 
             var cornerRadiusMask = new CanvasCommandList(control);
             using var cornerRadiusMaskDs = cornerRadiusMask.CreateDrawingSession();
@@ -96,7 +96,7 @@ namespace BetterLyrics.WinUI3.ViewModels.LyricsRendererViewModel
         /// <para><seealso cref="_isCoverAcrylicEffectAmountChanged"/> == true</para>
         /// <para><seealso cref="_isAlbumArtBgOpacityChanged"/> == true</para>
         /// <para><seealso cref="_albumArtBgTransition"/> 正在变化</para>
-        /// <para><seealso cref="_albumArtAccentColorTransition"/> 正在变化</para>
+        /// <para><seealso cref="_albumArtAccentColor1Transition"/> 正在变化</para>
         /// 如果上述条件均不满足，需调用 <seealso cref="UpdateAlbumArtBgRenderTarget"/> 来更新渲染缓存
         /// </summary>
         /// <param name="control"></param>
@@ -120,7 +120,7 @@ namespace BetterLyrics.WinUI3.ViewModels.LyricsRendererViewModel
 
             using var blurredCover = new GaussianBlurEffect
             {
-                BlurAmount = _settingsService.AppSettings.LyricsBackgroundSettings.CoverOverlayBlurAmount,
+                BlurAmount = _liveStatesService.LiveStates.LyricsWindowStatus.LyricsBackgroundSettings.CoverOverlayBlurAmount,
                 Source = overlappedCovers,
                 BorderMode = EffectBorderMode.Soft,
                 Optimization = EffectOptimization.Speed,
@@ -129,7 +129,7 @@ namespace BetterLyrics.WinUI3.ViewModels.LyricsRendererViewModel
             var combined = new CanvasCommandList(control);
             using var combinedDs = combined.CreateDrawingSession();
 
-            if (_settingsService.AppSettings.LyricsBackgroundSettings.CoverAcrylicEffectAmount > 0 && _coverAcrylicNoiseCanvasBitmap != null)
+            if (_liveStatesService.LiveStates.LyricsWindowStatus.LyricsBackgroundSettings.CoverAcrylicEffectAmount > 0 && _coverAcrylicNoiseCanvasBitmap != null)
             {
                 // 应用亚克力噪点效果
                 combinedDs.DrawImage(new BlendEffect
@@ -139,7 +139,7 @@ namespace BetterLyrics.WinUI3.ViewModels.LyricsRendererViewModel
                     Foreground = new OpacityEffect
                     {
                         Source = _coverAcrylicNoiseCanvasBitmap,
-                        Opacity = _settingsService.AppSettings.LyricsBackgroundSettings.CoverAcrylicEffectAmount / 100f,
+                        Opacity = _liveStatesService.LiveStates.LyricsWindowStatus.LyricsBackgroundSettings.CoverAcrylicEffectAmount / 100f,
                     },
                 });
             }
@@ -150,7 +150,7 @@ namespace BetterLyrics.WinUI3.ViewModels.LyricsRendererViewModel
 
             _albumArtBgEffect = new OpacityEffect
             {
-                Opacity = _settingsService.AppSettings.LyricsBackgroundSettings.CoverOverlayOpacity / 100f,
+                Opacity = _liveStatesService.LiveStates.LyricsWindowStatus.LyricsBackgroundSettings.CoverOverlayOpacity / 100f,
                 Source = combined,
             };
         }
@@ -190,7 +190,7 @@ namespace BetterLyrics.WinUI3.ViewModels.LyricsRendererViewModel
         /// <para><seealso cref="_albumArtChanged"/> == true</para>
         /// <para><seealso cref="_isAlbumArtShadowAmountChanged"/> == true</para>
         /// <para><seealso cref="_albumArtBgTransition"/> 正在变化</para>
-        /// <para><seealso cref="_albumArtAccentColorTransition"/> 正在变化</para>
+        /// <para><seealso cref="_albumArtAccentColor1Transition"/> 正在变化</para>
         /// 如果上述条件均不满足，需调用 <seealso cref="UpdateAlbumArtRenderTarget"/> 来更新渲染缓存
         /// </summary>
         /// <param name="control"></param>
@@ -223,8 +223,8 @@ namespace BetterLyrics.WinUI3.ViewModels.LyricsRendererViewModel
             combinedDs.DrawImage(new ShadowEffect
             {
                 Source = overlappedCovers,
-                ShadowColor = _albumArtAccentColorTransition.Value,
-                BlurAmount = _settingsService.AppSettings.AlbumArtLayoutSettings.CoverImageShadowAmount,
+                ShadowColor = _albumArtAccentColor1Transition.Value,
+                BlurAmount = _liveStatesService.LiveStates.LyricsWindowStatus.AlbumArtLayoutSettings.CoverImageShadowAmount,
                 Optimization = EffectOptimization.Speed,
             });
             combinedDs.DrawImage(overlappedCovers);

BetterLyrics.WinUI3/BetterLyrics.WinUI3/ViewModels/LyricsRendererViewModel/LyricsRendererViewModel.Messages.cs

@@ -20,14 +20,17 @@ namespace BetterLyrics.WinUI3.ViewModels.LyricsRendererViewModel
             IRecipient<PropertyChangedMessage<double>>,
             IRecipient<PropertyChangedMessage<bool>>,
             IRecipient<PropertyChangedMessage<Color>>,
-            IRecipient<PropertyChangedMessage<LyricsWindowMode>>,
             IRecipient<PropertyChangedMessage<LyricsDisplayType>>,
+            IRecipient<PropertyChangedMessage<LyricsLayoutOrientation>>,
             IRecipient<PropertyChangedMessage<LyricsFontColorType>>,
             IRecipient<PropertyChangedMessage<TextAlignmentType>>,
             IRecipient<PropertyChangedMessage<LyricsFontWeight>>,
             IRecipient<PropertyChangedMessage<LineRenderingType>>,
             IRecipient<PropertyChangedMessage<ElementTheme>>,
-            IRecipient<PropertyChangedMessage<EasingType>>
+            IRecipient<PropertyChangedMessage<EasingType>>,
+            IRecipient<PropertyChangedMessage<AlbumArtLayoutSettings>>,
+            IRecipient<PropertyChangedMessage<LyricsBackgroundSettings>>,
+            IRecipient<PropertyChangedMessage<LyricsWindowStatus>>
     {
 
         public void Receive(PropertyChangedMessage<bool> message)
@@ -53,19 +56,6 @@ namespace BetterLyrics.WinUI3.ViewModels.LyricsRendererViewModel
                 {
                 }
             }
-            else if (message.Sender is LyricsWindowViewModel)
-            {
-                if (message.PropertyName == nameof(LyricsWindowViewModel.IsLyricsWindowLocked))
-                {
-                    _isLyricsWindowLocked = message.NewValue;
-                    UpdateImmersiveBackgroundOpacity();
-                }
-                else if (message.PropertyName == nameof(LyricsWindowViewModel.IsMouseWithinWindow))
-                {
-                    _isMouseWithinWindow = message.NewValue;
-                    UpdateImmersiveBackgroundOpacity();
-                }
-            }
             else if (message.Sender is MediaSourceProviderInfo)
             {
                 if (message.PropertyName == nameof(MediaSourceProviderInfo.IsLastFMTrackEnabled))
@@ -80,13 +70,35 @@ namespace BetterLyrics.WinUI3.ViewModels.LyricsRendererViewModel
                     _isLayoutChanged = true;
                 }
             }
+            else if (message.Sender is AlbumArtLayoutSettings)
+            {
+                if (message.PropertyName == nameof(AlbumArtLayoutSettings.ShowTitle))
+                {
+                    _isSongTitleVisibilityChanged = true;
+                }
+                else if (message.PropertyName == nameof(AlbumArtLayoutSettings.ShowArtists))
+                {
+                    _isSongArtistsVisibilityChanged = true;
+                }
+                else if (message.PropertyName == nameof(AlbumArtLayoutSettings.AutoAlbumArtSize))
+                {
+                    _isAlbumArtSizeChanged = true;
+                }
+            }
+            else if (message.Sender is LyricsBackgroundSettings)
+            {
+                if (message.PropertyName == nameof(LyricsBackgroundSettings.IsSpectrumOverlayEnabled))
+                {
+                    _isSpectrumOverlayEnabledChanged = true;
+                }
+            }
         }
 
         public void Receive(PropertyChangedMessage<Color> message)
         {
             if (message.Sender is LyricsWindowViewModel)
             {
-                if (message.PropertyName == nameof(LyricsWindowViewModel.ActivatedWindowAccentColor))
+                if (message.PropertyName == nameof(LyricsWindowViewModel.BackdropAccentColor))
                 {
                     _immersiveBgColorTransition.StartTransition(message.NewValue);
                     _environmentalColor = message.NewValue;
@@ -137,6 +149,10 @@ namespace BetterLyrics.WinUI3.ViewModels.LyricsRendererViewModel
                 {
                     UpdateSongInfoFontSize();
                 }
+                else if (message.PropertyName == nameof(AlbumArtLayoutSettings.AlbumArtSize))
+                {
+                    _isAlbumArtSizeChanged = true;
+                }
             }
             else if (message.Sender is LyricsBackgroundSettings)
             {
@@ -244,22 +260,33 @@ namespace BetterLyrics.WinUI3.ViewModels.LyricsRendererViewModel
                 if (message.PropertyName == nameof(AlbumArtLayoutSettings.SongInfoAlignmentType))
                 {
                     _titleTextFormat.HorizontalAlignment = _artistTextFormat.HorizontalAlignment =
-                        _settingsService.AppSettings.AlbumArtLayoutSettings.SongInfoAlignmentType.ToCanvasHorizontalAlignment();
+                        _liveStatesService.LiveStates.LyricsWindowStatus.AlbumArtLayoutSettings.SongInfoAlignmentType.ToCanvasHorizontalAlignment();
                 }
             }
         }
 
         public void Receive(PropertyChangedMessage<LyricsDisplayType> message)
         {
-            if (message.Sender is LiveStates)
+            if (message.Sender is LyricsWindowStatus)
             {
-                if (message.PropertyName == nameof(LiveStates.LyricsDisplayType))
+                if (message.PropertyName == nameof(LyricsWindowStatus.LyricsDisplayType))
                 {
                     _isDisplayTypeChanged = true;
                 }
             }
         }
 
+        public void Receive(PropertyChangedMessage<LyricsLayoutOrientation> message)
+        {
+            if (message.Sender is LyricsWindowStatus)
+            {
+                if (message.PropertyName == nameof(LyricsWindowStatus.LyricsLayoutOrientation))
+                {
+                    _isLyricsLayoutOrientationChanged = true;
+                }
+            }
+        }
+
         public void Receive(PropertyChangedMessage<LyricsFontColorType> message)
         {
             if (message.Sender is LyricsStyleSettings)
@@ -323,17 +350,45 @@ namespace BetterLyrics.WinUI3.ViewModels.LyricsRendererViewModel
             }
         }
 
-        public void Receive(PropertyChangedMessage<LyricsWindowMode> message)
+        public void Receive(PropertyChangedMessage<LyricsWindowStatus> message)
         {
             if (message.Sender is LiveStates)
             {
-                if (message.PropertyName == nameof(LiveStates.LyricsWindowMode))
+                if (message.PropertyName == nameof(LiveStates.LyricsWindowStatus))
                 {
                     UpdateColorConfig();
-                    UpdateImmersiveBackgroundOpacity();
+                    UpdateSongInfoFontSize();
+                    
                     _isLayoutChanged = true;
                 }
             }
         }
+
+        public void Receive(PropertyChangedMessage<AlbumArtLayoutSettings> message)
+        {
+            if (message.Sender is LyricsWindowStatus)
+            {
+                if (message.PropertyName == nameof(LyricsWindowStatus.AlbumArtLayoutSettings))
+                {
+                    _isAlbumArtCornerRadiusChanged = true;
+                    _isAlbumArtShadowAmountChanged = true;
+                    UpdateSongInfoFontSize();
+                }
+            }
+        }
+
+        public void Receive(PropertyChangedMessage<LyricsBackgroundSettings> message)
+        {
+            if (message.Sender is LyricsWindowStatus)
+            {
+                if (message.PropertyName == nameof(LyricsWindowStatus.LyricsBackgroundSettings))
+                {
+                    _isAlbumArtBgOpacityChanged = true;
+                    _isAlbumArtBgBlurAmountChanged = true;
+                    _isCoverAcrylicEffectAmountChanged = true;
+                    UpdateColorConfig();
+                }
+            }
+        }
     }
 }

BetterLyrics.WinUI3/BetterLyrics.WinUI3/ViewModels/LyricsRendererViewModel/LyricsRendererViewModel.Transition.cs

@@ -24,7 +24,25 @@ namespace BetterLyrics.WinUI3.ViewModels.LyricsRendererViewModel
             interpolator: (from, to, progress) => Helper.ColorHelper.GetInterpolatedColor(progress, from, to)
         );
 
-        private readonly ValueTransition<Color> _albumArtAccentColorTransition = new(
+        private readonly ValueTransition<Color> _albumArtAccentColor1Transition = new(
+            initialValue: Colors.Transparent,
+            durationSeconds: 0.3f,
+            interpolator: (from, to, progress) => Helper.ColorHelper.GetInterpolatedColor(progress, from, to)
+        );
+
+        private readonly ValueTransition<Color> _albumArtAccentColor2Transition = new(
+            initialValue: Colors.Transparent,
+            durationSeconds: 0.3f,
+            interpolator: (from, to, progress) => Helper.ColorHelper.GetInterpolatedColor(progress, from, to)
+        );
+
+        private readonly ValueTransition<Color> _albumArtAccentColor3Transition = new(
+            initialValue: Colors.Transparent,
+            durationSeconds: 0.3f,
+            interpolator: (from, to, progress) => Helper.ColorHelper.GetInterpolatedColor(progress, from, to)
+        );
+
+        private readonly ValueTransition<Color> _albumArtAccentColor4Transition = new(
             initialValue: Colors.Transparent,
             durationSeconds: 0.3f,
             interpolator: (from, to, progress) => Helper.ColorHelper.GetInterpolatedColor(progress, from, to)

BetterLyrics.WinUI3/BetterLyrics.WinUI3/ViewModels/LyricsRendererViewModel/LyricsRendererViewModel.Update.cs

@@ -1,6 +1,8 @@
-using BetterLyrics.WinUI3.Enums;
+using BetterLyrics.WinUI3.Constants;
+using BetterLyrics.WinUI3.Enums;
 using BetterLyrics.WinUI3.Helper;
 using BetterLyrics.WinUI3.Models;
+using CommunityToolkit.WinUI;
 using Microsoft.Graphics.Canvas;
 using Microsoft.Graphics.Canvas.Effects;
 using Microsoft.Graphics.Canvas.Text;
@@ -46,6 +48,14 @@ namespace BetterLyrics.WinUI3.ViewModels.LyricsRendererViewModel
         private bool _isAlbumArtBgEffectChanged = false;
         private bool _isAlbumArtEffectChanged = false;
 
+        private bool _isSongTitleVisibilityChanged = false;
+        private bool _isSongArtistsVisibilityChanged = false;
+
+        private bool _isSongInfoFontSizeChanged = false;
+        private bool _isAlbumArtSizeChanged = false;
+
+        private bool _isSpectrumOverlayEnabledChanged = true;
+
         public void Update(ICanvasAnimatedControl control, CanvasAnimatedUpdateEventArgs args)
         {
             _elapsedTime = args.Timing.ElapsedTime;
@@ -61,6 +71,32 @@ namespace BetterLyrics.WinUI3.ViewModels.LyricsRendererViewModel
                 }
             }
 
+            //_effect?.Properties["iTime"] = Convert.ToSingle(TotalTime.TotalSeconds);
+
+            if (_effect != null)
+            {
+                var effectTime = Convert.ToSingle(_effect.Properties["iTime"]);
+                effectTime += Convert.ToSingle(_elapsedTime.TotalSeconds);
+                _effect.Properties["iTime"] = effectTime;
+
+                if (_albumArtAccentColor1Transition.IsTransitioning)
+                {
+                    _effect.Properties["color1"] = _albumArtAccentColor1Transition.Value.ToVector3RGB();
+                }
+                if (_albumArtAccentColor2Transition.IsTransitioning)
+                {
+                    _effect.Properties["color2"] = _albumArtAccentColor2Transition.Value.ToVector3RGB();
+                }
+                if (_albumArtAccentColor3Transition.IsTransitioning)
+                {
+                    _effect.Properties["color3"] = _albumArtAccentColor3Transition.Value.ToVector3RGB();
+                }
+                if (_albumArtAccentColor4Transition.IsTransitioning)
+                {
+                    _effect.Properties["color4"] = _albumArtAccentColor4Transition.Value.ToVector3RGB();
+                }
+            }
+
             // 检测播放行变更
             var playingLineIndex = GetCurrentPlayingLineIndex();
             _isPlayingLineChanged = _playingLineIndex != playingLineIndex;
@@ -88,38 +124,86 @@ namespace BetterLyrics.WinUI3.ViewModels.LyricsRendererViewModel
                 _isDebugOverlayEnabledChanged = false;
             }
 
-            _rotateAngle += _coverRotateBaseSpeed * _settingsService.AppSettings.LyricsBackgroundSettings.CoverOverlaySpeed / 100.0;
+            _rotateAngle += _coverRotateBaseSpeed * _liveStatesService.LiveStates.LyricsWindowStatus.LyricsBackgroundSettings.CoverOverlaySpeed / 100.0;
             _rotateAngle %= Math.PI * 2;
 
-            if (_isCanvasWidthChanged)
+            if (_isSpectrumOverlayEnabledChanged)
             {
-                if (_canvasWidth < 500)
+                if (_liveStatesService.LiveStates.LyricsWindowStatus.LyricsBackgroundSettings.IsSpectrumOverlayEnabled)
                 {
-                    _lyricsLayoutOrientation = LyricsLayoutOrientation.Vertical;
+                    _spectrumAnalyzer?.StartCapture();
                 }
                 else
                 {
-                    _lyricsLayoutOrientation = LyricsLayoutOrientation.Horizontal;
+                    _spectrumAnalyzer?.StopCapture();
                 }
+
+                _isSpectrumOverlayEnabledChanged = false;
             }
 
+            if (_spectrumAnalyzer?.IsCapturing == true)
+            {
+                _spectrumAnalyzer?.UpdateSmoothSpectrum();
+            }
+
+            //if (_isCanvasWidthChanged)
+            //{
+            //    if (_canvasWidth < 500)
+            //    {
+            //        _lyricsLayoutOrientation = LyricsLayoutOrientation.Vertical;
+            //    }
+            //    else
+            //    {
+            //        _lyricsLayoutOrientation = LyricsLayoutOrientation.Horizontal;
+            //    }
+            //}
+
             if (_isCanvasWidthChanged || _isCanvasHeightChanged)
             {
                 _isCoverAcrylicEffectAmountChanged = true;
+
+                _effect?.Properties["Width"] = (float)control.ConvertDipsToPixels((float)_canvasWidth, CanvasDpiRounding.Round);
+                _effect?.Properties["Height"] = (float)control.ConvertDipsToPixels((float)_canvasHeight, CanvasDpiRounding.Round);
             }
 
-            if (_isDisplayTypeChanged || _isCanvasWidthChanged || _isCanvasHeightChanged)
+            if (_isSongInfoFontSizeChanged || _isSongTitleVisibilityChanged || _isSongArtistsVisibilityChanged)
             {
-                bool jumpTo = !_isDisplayTypeChanged && (_isCanvasWidthChanged || _isCanvasHeightChanged);
-                switch (_lyricsLayoutOrientation)
+                _songInfoHeight = 0;
+                if (_liveStatesService.LiveStates.LyricsWindowStatus.AlbumArtLayoutSettings.ShowTitle)
+                {
+                    _songInfoHeight += (int)_titleTextFormat.FontSize;
+                    if (_liveStatesService.LiveStates.LyricsWindowStatus.AlbumArtLayoutSettings.ShowArtists)
+                    {
+                        _songInfoHeight += (int)_artistTextFormat.FontSize;
+                    }
+                }
+            }
+
+            if (_isDisplayTypeChanged || _isLyricsLayoutOrientationChanged || _isAlbumArtSizeChanged ||
+                _isSongInfoFontSizeChanged || _isSongTitleVisibilityChanged || _isSongArtistsVisibilityChanged ||
+                _isCanvasWidthChanged || _isCanvasHeightChanged ||
+                _isAlbumArtSizeChanged)
+            {
+                bool jumpTo = !_isDisplayTypeChanged && !_isLyricsLayoutOrientationChanged &&
+                    (_isCanvasWidthChanged || _isCanvasHeightChanged);
+                switch (_liveStatesService.LiveStates.LyricsWindowStatus.LyricsLayoutOrientation)
                 {
                     case LyricsLayoutOrientation.Horizontal:
-                        _albumArtSize = Math.Min((_canvasHeight - _topMargin - _bottomMargin) * 8.5 / 16.0, (_canvasWidth - _leftMargin - _middleMargin - _rightMargin) / 2.0);
-                        _albumArtSize = Math.Max(0, _albumArtSize);
-                        _albumArtYTransition.StartTransition((_canvasHeight - _albumArtSize * 1.05 - _titleTextFormat.FontSize - _artistTextFormat.FontSize) / 2.0, jumpTo);
+                        if (_liveStatesService.LiveStates.LyricsWindowStatus.AlbumArtLayoutSettings.AutoAlbumArtSize)
+                        {
+                            _albumArtSize = Math.Min((_canvasHeight - _topMargin - _bottomMargin) * 8.5 / 16.0,
+                                (_canvasWidth - _leftMargin - _middleMargin - _rightMargin) / 2.0);
+                            _albumArtSize = Math.Max(0, _albumArtSize);
+                        }
+                        else
+                        {
+                            _albumArtSize = _liveStatesService.LiveStates.LyricsWindowStatus.AlbumArtLayoutSettings.AlbumArtSize;
+                        }
+                        //_albumArtYTransition.StartTransition((_canvasHeight - _albumArtSize * 1.05 - _songInfoHeight) / 2.0, jumpTo);
+                        _albumArtYTransition.StartTransition((_canvasHeight - _albumArtSize - _songInfoHeight) / 2.0, jumpTo);
                         _titleYTransition.StartTransition(_albumArtYTransition.TargetValue + _albumArtSize * 1.05, jumpTo);
                         _lyricsYTransition.StartTransition(0, jumpTo);
-                        switch (_liveStatesService.LiveStates.LyricsDisplayType)
+                        switch (_liveStatesService.LiveStates.LyricsWindowStatus.LyricsDisplayType)
                         {
                             case LyricsDisplayType.AlbumArtOnly:
                                 _lyricsOpacityTransition.StartTransition(0f, jumpTo);
@@ -144,11 +228,18 @@ namespace BetterLyrics.WinUI3.ViewModels.LyricsRendererViewModel
                         }
                         break;
                     case LyricsLayoutOrientation.Vertical:
-                        _albumArtSize = 64;
+                        if (_liveStatesService.LiveStates.LyricsWindowStatus.AlbumArtLayoutSettings.AutoAlbumArtSize)
+                        {
+                            _albumArtSize = 64;
+                        }
+                        else
+                        {
+                            _albumArtSize = _liveStatesService.LiveStates.LyricsWindowStatus.AlbumArtLayoutSettings.AlbumArtSize;
+                        }
                         _lyricsXTransition.StartTransition(_leftMargin, jumpTo);
                         _albumArtXTransition.StartTransition(_leftMargin, jumpTo);
                         _titleXTransition.StartTransition(_leftMargin + _albumArtSize * 1.2, jumpTo);
-                        switch (_liveStatesService.LiveStates.LyricsDisplayType)
+                        switch (_liveStatesService.LiveStates.LyricsWindowStatus.LyricsDisplayType)
                         {
                             case LyricsDisplayType.AlbumArtOnly:
                                 _lyricsOpacityTransition.StartTransition(0f, jumpTo);
@@ -166,7 +257,8 @@ namespace BetterLyrics.WinUI3.ViewModels.LyricsRendererViewModel
                                 _titleYTransition.StartTransition(_topMargin, jumpTo);
                                 _lyricsOpacityTransition.StartTransition(1f, jumpTo);
                                 _albumArtOpacityTransition.StartTransition(1f, jumpTo);
-                                _lyricsYTransition.StartTransition(_albumArtSize, jumpTo);
+                                //_lyricsYTransition.StartTransition(_albumArtSize, jumpTo);
+                                _lyricsYTransition.StartTransition(_topMargin, jumpTo);
                                 break;
                             default:
                                 break;
@@ -176,6 +268,10 @@ namespace BetterLyrics.WinUI3.ViewModels.LyricsRendererViewModel
                         break;
                 }
                 _isDisplayTypeChanged = false;
+
+                _isSongInfoFontSizeChanged = false;
+                _isSongTitleVisibilityChanged = false;
+                _isSongArtistsVisibilityChanged = false;
             }
 
             // 先重置这两个的变化状态
@@ -197,11 +293,12 @@ namespace BetterLyrics.WinUI3.ViewModels.LyricsRendererViewModel
                 }
             }
 
-            // 背景图切换计算
+            // 背景图变动计算
             // 将当前背景图放到 _lastAlbumArtSwBitmap 中 并设置不透明度为 1 
             // 将新的背景图放到 _albumArtSwBitmap 中 并设置不透明度为 0
             // 这样可以实现背景图的连贯渐变效果
-            if (_albumArtChanged || _isCanvasHeightChanged || _isCanvasWidthChanged ||
+            if (_albumArtChanged || _isLyricsLayoutOrientationChanged || _isAlbumArtSizeChanged ||
+                _isCanvasHeightChanged || _isCanvasWidthChanged ||
                 _lyricsBgBrightnessTransition.IsTransitioning ||
                 _albumArtBgTransition.IsTransitioning)
             {
@@ -237,6 +334,9 @@ namespace BetterLyrics.WinUI3.ViewModels.LyricsRendererViewModel
                 _isAlbumArtBgEffectChanged = true;
             }
 
+            _isLyricsLayoutOrientationChanged = false;
+            _isAlbumArtSizeChanged = false;
+
             if (_isCoverAcrylicEffectAmountChanged)
             {
                 UpdateCoverAcrylicOverlay(control);
@@ -314,7 +414,12 @@ namespace BetterLyrics.WinUI3.ViewModels.LyricsRendererViewModel
             _albumArtOpacityTransition.Update(_elapsedTime);
             _immersiveBgOpacityTransition.Update(_elapsedTime);
             _immersiveBgColorTransition.Update(_elapsedTime);
-            _albumArtAccentColorTransition.Update(_elapsedTime);
+            
+            _albumArtAccentColor1Transition.Update(_elapsedTime);
+            _albumArtAccentColor2Transition.Update(_elapsedTime);
+            _albumArtAccentColor3Transition.Update(_elapsedTime);
+            _albumArtAccentColor4Transition.Update(_elapsedTime);
+
             _albumArtBgTransition.Update(_elapsedTime);
             _lyricsBgBrightnessTransition.Update(_elapsedTime);
             _songInfoOpacityTransition.Update(_elapsedTime);
@@ -326,19 +431,19 @@ namespace BetterLyrics.WinUI3.ViewModels.LyricsRendererViewModel
             if (control == null)
                 return;
 
-            if (_liveStatesService.LiveStates.LyricsStyleSettings.IsDynamicLyricsFontSize)
+            if (_liveStatesService.LiveStates.LyricsWindowStatus.LyricsStyleSettings.IsDynamicLyricsFontSize)
             {
                 _lyricsTextFormat.FontSize = (float)Math.Clamp(Math.Min(_canvasHeight, _canvasWidth) / 10, 12, 72);
             }
             else
             {
-                _lyricsTextFormat.FontSize = _liveStatesService.LiveStates.LyricsStyleSettings.LyricsFontSize;
+                _lyricsTextFormat.FontSize = _liveStatesService.LiveStates.LyricsWindowStatus.LyricsStyleSettings.LyricsFontSize;
             }
-            _lyricsTextFormat.FontWeight = _liveStatesService.LiveStates.LyricsStyleSettings.LyricsFontWeight.ToFontWeight();
-            _lyricsTextFormat.FontFamily = _artistTextFormat.FontFamily = _titleTextFormat.FontFamily = _liveStatesService.LiveStates.LyricsStyleSettings.LyricsFontFamily;
+            _lyricsTextFormat.FontWeight = _liveStatesService.LiveStates.LyricsWindowStatus.LyricsStyleSettings.LyricsFontWeight.ToFontWeight();
+            _lyricsTextFormat.FontFamily = _artistTextFormat.FontFamily = _titleTextFormat.FontFamily = _liveStatesService.LiveStates.LyricsWindowStatus.LyricsStyleSettings.LyricsFontFamily;
 
-            _canvasYScrollTransition.SetDuration(_liveStatesService.LiveStates.LyricsEffectSettings.LyricsScrollDuration / 1000.0);
-            _canvasYScrollTransition.SetEasingType(_liveStatesService.LiveStates.LyricsEffectSettings.LyricsScrollEasingType);
+            _canvasYScrollTransition.SetDuration(_liveStatesService.LiveStates.LyricsWindowStatus.LyricsEffectSettings.LyricsScrollDuration / 1000.0);
+            _canvasYScrollTransition.SetEasingType(_liveStatesService.LiveStates.LyricsWindowStatus.LyricsEffectSettings.LyricsScrollEasingType);
 
             double y = 0;
 
@@ -353,15 +458,15 @@ namespace BetterLyrics.WinUI3.ViewModels.LyricsRendererViewModel
                 }
 
                 line.Position = new Vector2(0, (float)y);
-                line.RecreateTextLayout(control, _lyricsTextFormat, _maxLyricsWidth, _canvasHeight, _liveStatesService.LiveStates.LyricsStyleSettings.LyricsAlignmentType);
-                line.UpdateCenterPosition(_maxLyricsWidth, _liveStatesService.LiveStates.LyricsStyleSettings.LyricsAlignmentType);
+                line.RecreateTextLayout(control, _lyricsTextFormat, _maxLyricsWidth, _canvasHeight, _liveStatesService.LiveStates.LyricsWindowStatus.LyricsStyleSettings.LyricsAlignmentType);
+                line.UpdateCenterPosition(_maxLyricsWidth, _liveStatesService.LiveStates.LyricsWindowStatus.LyricsStyleSettings.LyricsAlignmentType);
 
                 line.RecreateTextGeometry();
 
                 y +=
                     (double)line.CanvasTextLayout!.LayoutBounds.Height
                     / line.CanvasTextLayout.LineCount
-                    * (line.CanvasTextLayout.LineCount + _liveStatesService.LiveStates.LyricsStyleSettings.LyricsLineSpacingFactor);
+                    * (line.CanvasTextLayout.LineCount + _liveStatesService.LiveStates.LyricsWindowStatus.LyricsStyleSettings.LyricsLineSpacingFactor);
             }
         }
 
@@ -458,14 +563,13 @@ namespace BetterLyrics.WinUI3.ViewModels.LyricsRendererViewModel
 
         private void UpdateColorConfig()
         {
-            if (_liveStatesService.LiveStates.LyricsWindowMode == LyricsWindowMode.DesktopMode ||
-                _liveStatesService.LiveStates.LyricsWindowMode == LyricsWindowMode.DockMode)
+            if (_liveStatesService.LiveStates.LyricsWindowStatus.IsAdaptToEnvironment)
             {
                 ThemeTypeSent = Helper.ColorHelper.GetElementThemeFromBackgroundColor(_environmentalColor);
             }
             else
             {
-                ThemeTypeSent = _settingsService.AppSettings.LyricsBackgroundSettings.LyricsBackgroundTheme;
+                ThemeTypeSent = _liveStatesService.LiveStates.LyricsWindowStatus.LyricsBackgroundSettings.LyricsBackgroundTheme;
             }
 
             double brightness;
@@ -483,20 +587,25 @@ namespace BetterLyrics.WinUI3.ViewModels.LyricsRendererViewModel
                 _adaptiveGrayedFontColor = _darkColor;
                 brightness = 0.7f;
                 _grayedEnvironmentalColor = _lightColor;
-                _albumArtAccentColorTransition.StartTransition(_albumArtLightAccentColor);
+                _albumArtAccentColor1Transition.StartTransition(_albumArtLightAccentColors.ElementAtOrDefault(0));
+                _albumArtAccentColor2Transition.StartTransition(_albumArtLightAccentColors.ElementAtOrDefault(1));
+                _albumArtAccentColor3Transition.StartTransition(_albumArtLightAccentColors.ElementAtOrDefault(2));
+                _albumArtAccentColor4Transition.StartTransition(_albumArtLightAccentColors.ElementAtOrDefault(3));
             }
             else
             {
                 _adaptiveGrayedFontColor = _lightColor;
                 brightness = 0.3f;
                 _grayedEnvironmentalColor = _darkColor;
-                _albumArtAccentColorTransition.StartTransition(_albumArtDarkAccentColor);
+                _albumArtAccentColor1Transition.StartTransition(_albumArtDarkAccentColors.ElementAtOrDefault(0));
+                _albumArtAccentColor2Transition.StartTransition(_albumArtDarkAccentColors.ElementAtOrDefault(1));
+                _albumArtAccentColor3Transition.StartTransition(_albumArtDarkAccentColors.ElementAtOrDefault(2));
+                _albumArtAccentColor4Transition.StartTransition(_albumArtDarkAccentColors.ElementAtOrDefault(3));
             }
 
             _lyricsBgBrightnessTransition.StartTransition(brightness);
 
-            if (_liveStatesService.LiveStates.LyricsWindowMode == LyricsWindowMode.DockMode ||
-                _liveStatesService.LiveStates.LyricsWindowMode == LyricsWindowMode.DesktopMode)
+            if (_liveStatesService.LiveStates.LyricsWindowStatus.IsAdaptToEnvironment)
             {
                 _adaptiveColoredFontColor = Helper.ColorHelper.GetForegroundColor(_environmentalColor);
             }
@@ -504,15 +613,15 @@ namespace BetterLyrics.WinUI3.ViewModels.LyricsRendererViewModel
             {
                 if (isLight)
                 {
-                    _adaptiveColoredFontColor = _albumArtDarkAccentColor;
+                    _adaptiveColoredFontColor = _albumArtDarkAccentColors.FirstOrDefault();
                 }
                 else
                 {
-                    _adaptiveColoredFontColor = _albumArtLightAccentColor;
+                    _adaptiveColoredFontColor = _albumArtLightAccentColors.FirstOrDefault();
                 }
             }
 
-            switch (_liveStatesService.LiveStates.LyricsStyleSettings.LyricsBgFontColorType)
+            switch (_liveStatesService.LiveStates.LyricsWindowStatus.LyricsStyleSettings.LyricsBgFontColorType)
             {
                 case LyricsFontColorType.AdaptiveGrayed:
                     _bgFontColor = _adaptiveGrayedFontColor;
@@ -521,13 +630,13 @@ namespace BetterLyrics.WinUI3.ViewModels.LyricsRendererViewModel
                     _bgFontColor = _adaptiveColoredFontColor ?? _adaptiveGrayedFontColor;
                     break;
                 case LyricsFontColorType.Custom:
-                    _bgFontColor = _liveStatesService.LiveStates.LyricsStyleSettings.LyricsCustomBgFontColor;
+                    _bgFontColor = _liveStatesService.LiveStates.LyricsWindowStatus.LyricsStyleSettings.LyricsCustomBgFontColor;
                     break;
                 default:
                     break;
             }
 
-            switch (_liveStatesService.LiveStates.LyricsStyleSettings.LyricsFgFontColorType)
+            switch (_liveStatesService.LiveStates.LyricsWindowStatus.LyricsStyleSettings.LyricsFgFontColorType)
             {
                 case LyricsFontColorType.AdaptiveGrayed:
                     _fgFontColor = _adaptiveGrayedFontColor;
@@ -536,13 +645,13 @@ namespace BetterLyrics.WinUI3.ViewModels.LyricsRendererViewModel
                     _fgFontColor = _adaptiveColoredFontColor ?? _adaptiveGrayedFontColor;
                     break;
                 case LyricsFontColorType.Custom:
-                    _fgFontColor = _liveStatesService.LiveStates.LyricsStyleSettings.LyricsCustomFgFontColor;
+                    _fgFontColor = _liveStatesService.LiveStates.LyricsWindowStatus.LyricsStyleSettings.LyricsCustomFgFontColor;
                     break;
                 default:
                     break;
             }
 
-            switch (_liveStatesService.LiveStates.LyricsStyleSettings.LyricsStrokeFontColorType)
+            switch (_liveStatesService.LiveStates.LyricsWindowStatus.LyricsStyleSettings.LyricsStrokeFontColorType)
             {
                 case LyricsFontColorType.AdaptiveGrayed:
                     _strokeFontColor = _grayedEnvironmentalColor.WithBrightness(0.7);
@@ -551,7 +660,7 @@ namespace BetterLyrics.WinUI3.ViewModels.LyricsRendererViewModel
                     _strokeFontColor = _environmentalColor.WithBrightness(0.7);
                     break;
                 case LyricsFontColorType.Custom:
-                    _strokeFontColor = _liveStatesService.LiveStates.LyricsStyleSettings.LyricsCustomStrokeFontColor;
+                    _strokeFontColor = _liveStatesService.LiveStates.LyricsWindowStatus.LyricsStyleSettings.LyricsCustomStrokeFontColor;
                     break;
                 default:
                     break;
@@ -579,7 +688,7 @@ namespace BetterLyrics.WinUI3.ViewModels.LyricsRendererViewModel
                     double distanceFromPlayingLine = Math.Abs(line.Position.Y - currentPlayingLine.Position.Y);
                     double distanceFactor = Math.Clamp(distanceFromPlayingLine / (_canvasHeight / 2), 0, 1);
 
-                    line.AngleTransition.StartTransition(_liveStatesService.LiveStates.LyricsEffectSettings.IsFanLyricsEnabled
+                    line.AngleTransition.StartTransition(_liveStatesService.LiveStates.LyricsWindowStatus.LyricsEffectSettings.IsFanLyricsEnabled
                             ? Math.PI
                                 * (30.0 / 180.0)
                                 * distanceFactor
@@ -587,12 +696,12 @@ namespace BetterLyrics.WinUI3.ViewModels.LyricsRendererViewModel
                             : 0
                     );
 
-                    line.BlurAmountTransition.StartTransition(_liveStatesService.LiveStates.LyricsEffectSettings.LyricsBlurAmount * distanceFactor);
+                    line.BlurAmountTransition.StartTransition(_liveStatesService.LiveStates.LyricsWindowStatus.LyricsEffectSettings.LyricsBlurAmount * distanceFactor);
                     line.ScaleTransition.StartTransition(_highlightedScale - distanceFactor * (_highlightedScale - _defaultScale));
                     line.OpacityTransition.StartTransition(
-                        _liveStatesService.LiveStates.LyricsStyleSettings.LyricsBgFontOpacity / 100.0 -
-                        distanceFactor * _liveStatesService.LiveStates.LyricsStyleSettings.LyricsBgFontOpacity / 100.0 *
-                        (1 - _liveStatesService.LiveStates.LyricsEffectSettings.LyricsVerticalEdgeOpacity / 100.0));
+                        _liveStatesService.LiveStates.LyricsWindowStatus.LyricsStyleSettings.LyricsBgFontOpacity / 100.0 -
+                        distanceFactor * _liveStatesService.LiveStates.LyricsWindowStatus.LyricsStyleSettings.LyricsBgFontOpacity / 100.0 *
+                        (1 - _liveStatesService.LiveStates.LyricsWindowStatus.LyricsEffectSettings.LyricsVerticalEdgeOpacity / 100.0));
                     line.HighlightOpacityTransition.StartTransition(i == _playingLineIndex ? 1f : 0f);
 
                     double yScrollDuration;
@@ -602,8 +711,8 @@ namespace BetterLyrics.WinUI3.ViewModels.LyricsRendererViewModel
                     {
                         yScrollDuration =
                             _canvasYScrollTransition.DurationSeconds +
-                            distanceFactor * (_liveStatesService.LiveStates.LyricsEffectSettings.LyricsScrollTopDuration / 1000.0 - _canvasYScrollTransition.DurationSeconds);
-                        yScrollDelay = distanceFactor * _liveStatesService.LiveStates.LyricsEffectSettings.LyricsScrollTopDelay / 1000.0;
+                            distanceFactor * (_liveStatesService.LiveStates.LyricsWindowStatus.LyricsEffectSettings.LyricsScrollTopDuration / 1000.0 - _canvasYScrollTransition.DurationSeconds);
+                        yScrollDelay = distanceFactor * _liveStatesService.LiveStates.LyricsWindowStatus.LyricsEffectSettings.LyricsScrollTopDelay / 1000.0;
                     }
                     else if (lineCountDelta == 0)
                     {
@@ -614,8 +723,8 @@ namespace BetterLyrics.WinUI3.ViewModels.LyricsRendererViewModel
                     {
                         yScrollDuration =
                             _canvasYScrollTransition.DurationSeconds +
-                            distanceFactor * (_liveStatesService.LiveStates.LyricsEffectSettings.LyricsScrollBottomDuration / 1000.0 - _canvasYScrollTransition.DurationSeconds);
-                        yScrollDelay = distanceFactor * _liveStatesService.LiveStates.LyricsEffectSettings.LyricsScrollBottomDelay / 1000.0;
+                            distanceFactor * (_liveStatesService.LiveStates.LyricsWindowStatus.LyricsEffectSettings.LyricsScrollBottomDuration / 1000.0 - _canvasYScrollTransition.DurationSeconds);
+                        yScrollDelay = distanceFactor * _liveStatesService.LiveStates.LyricsWindowStatus.LyricsEffectSettings.LyricsScrollBottomDelay / 1000.0;
                     }
 
                     line.YOffsetTransition.SetEasingType(_canvasYScrollTransition.EasingType ?? EasingType.Linear);
@@ -633,37 +742,9 @@ namespace BetterLyrics.WinUI3.ViewModels.LyricsRendererViewModel
             }
         }
 
-        private void UpdateImmersiveBackgroundOpacity()
-        {
-            double targetOpacity;
-            if (_liveStatesService.LiveStates.LyricsWindowMode == LyricsWindowMode.DesktopMode)
-            {
-                if (_isLyricsWindowLocked)
-                {
-                    targetOpacity = 0;
-                }
-                else
-                {
-                    if (_isMouseWithinWindow)
-                    {
-                        targetOpacity = 1f;
-                    }
-                    else
-                    {
-                        targetOpacity = 0f;
-                    }
-                }
-            }
-            else
-            {
-                targetOpacity = 1f;
-            }
-            _immersiveBgOpacityTransition.StartTransition(targetOpacity);
-        }
-
         private void UpdateCoverAcrylicOverlay(ICanvasAnimatedControl control)
         {
-            if (_settingsService.AppSettings.LyricsBackgroundSettings.CoverAcrylicEffectAmount > 0)
+            if (_liveStatesService.LiveStates.LyricsWindowStatus.LyricsBackgroundSettings.CoverAcrylicEffectAmount > 0)
             {
                 var ret = ImageHelper.GenerateNoiseBGRA((int)_canvasWidth, (int)_canvasHeight);
                 _coverAcrylicNoiseCanvasBitmap?.Dispose();
@@ -698,8 +779,10 @@ namespace BetterLyrics.WinUI3.ViewModels.LyricsRendererViewModel
 
         private void UpdateSongInfoFontSize()
         {
-            _titleTextFormat.FontSize = _settingsService.AppSettings.AlbumArtLayoutSettings.SongInfoFontSize;
-            _artistTextFormat.FontSize = _settingsService.AppSettings.AlbumArtLayoutSettings.SongInfoFontSize - 2;
+            _titleTextFormat.FontSize = _liveStatesService.LiveStates.LyricsWindowStatus.AlbumArtLayoutSettings.SongInfoFontSize;
+            _artistTextFormat.FontSize = _liveStatesService.LiveStates.LyricsWindowStatus.AlbumArtLayoutSettings.SongInfoFontSize - 2;
+
+            _isSongInfoFontSizeChanged = true;
         }
     }
 }

BetterLyrics.WinUI3/BetterLyrics.WinUI3/ViewModels/LyricsRendererViewModel/LyricsRendererViewModel.cs

@@ -18,6 +18,7 @@ using CommunityToolkit.Mvvm.DependencyInjection;
 using CommunityToolkit.WinUI;
 using Microsoft.Extensions.Logging;
 using Microsoft.Graphics.Canvas;
+using Microsoft.Graphics.Canvas.Effects;
 using Microsoft.Graphics.Canvas.Text;
 using Microsoft.UI;
 using Microsoft.UI.Text;
@@ -68,6 +69,7 @@ namespace BetterLyrics.WinUI3.ViewModels.LyricsRendererViewModel
         private CanvasBitmap? _coverAcrylicNoiseCanvasBitmap = null;
 
         private double _albumArtSize = 0f;
+        private int _songInfoHeight = 0;
 
         private string? _lastSongTitle;
         private string? _songTitle;
@@ -103,8 +105,8 @@ namespace BetterLyrics.WinUI3.ViewModels.LyricsRendererViewModel
         private Color _adaptiveGrayedFontColor = Colors.Transparent;
         private Color? _adaptiveColoredFontColor = null;
 
-        private Color _albumArtLightAccentColor = Colors.Transparent;
-        private Color _albumArtDarkAccentColor = Colors.Transparent;
+        private List<Color> _albumArtLightAccentColors = Enumerable.Repeat(Colors.Transparent, 4).ToList();
+        private List<Color> _albumArtDarkAccentColors = Enumerable.Repeat(Colors.Transparent, 4).ToList();
         private Color _environmentalColor = Colors.Transparent;
         private Color _grayedEnvironmentalColor = Colors.Transparent;
 
@@ -127,9 +129,6 @@ namespace BetterLyrics.WinUI3.ViewModels.LyricsRendererViewModel
         [ObservableProperty]
         public partial bool IsPlaying { get; set; } = false;
 
-        private bool _isLyricsWindowLocked = false;
-        private bool _isMouseWithinWindow = false;
-
         private bool _isLayoutChanged = true;
 
         private int _timelineSyncThreshold = 0;
@@ -164,7 +163,7 @@ namespace BetterLyrics.WinUI3.ViewModels.LyricsRendererViewModel
             FontWeight = FontWeights.ExtraBlack,
         };
 
-        private LyricsLayoutOrientation _lyricsLayoutOrientation;
+        //private LyricsLayoutOrientation _lyricsLayoutOrientation;
 
         [ObservableProperty]
         public partial SongInfo? SongInfo { get; set; }
@@ -173,6 +172,8 @@ namespace BetterLyrics.WinUI3.ViewModels.LyricsRendererViewModel
         [NotifyPropertyChangedRecipients]
         public partial ElementTheme ThemeTypeSent { get; set; }
 
+        private SpectrumAnalyzer? _spectrumAnalyzer;
+
         public LyricsRendererViewModel(
             ISettingsService settingsService,
             IMediaSessionsService mediaSessionsService,
@@ -182,17 +183,15 @@ namespace BetterLyrics.WinUI3.ViewModels.LyricsRendererViewModel
             _settingsService = settingsService;
             _mediaSessionsService = mediaSessionsService;
             _liveStatesService = liveStatesService;
-
             _lastFMService = lastFMService;
 
             _logger = Ioc.Default.GetRequiredService<ILogger<LyricsRendererViewModel>>();
 
             AppSettings = _settingsService.AppSettings;
 
-            _titleTextFormat.HorizontalAlignment = _artistTextFormat.HorizontalAlignment = _settingsService.AppSettings.AlbumArtLayoutSettings.SongInfoAlignmentType.ToCanvasHorizontalAlignment();
+            _titleTextFormat.HorizontalAlignment = _artistTextFormat.HorizontalAlignment = _liveStatesService.LiveStates.LyricsWindowStatus.AlbumArtLayoutSettings.SongInfoAlignmentType.ToCanvasHorizontalAlignment();
             UpdateSongInfoFontSize();
 
-
             _timelineSyncThreshold = 0;
 
             _mediaSessionsService.IsPlayingChanged += MediaSessionsService_IsPlayingChanged;
@@ -204,6 +203,8 @@ namespace BetterLyrics.WinUI3.ViewModels.LyricsRendererViewModel
             IsPlaying = _mediaSessionsService.IsPlaying;
 
             UpdateColorConfig();
+
+            _spectrumAnalyzer = new SpectrumAnalyzer();
         }
 
         private void MediaSessionsService_LyricsChanged(object? sender, LyricsChangedEventArgs e)
@@ -398,8 +399,8 @@ namespace BetterLyrics.WinUI3.ViewModels.LyricsRendererViewModel
 
             _albumArtChanged = true;
 
-            _albumArtLightAccentColor = e.AlbumArtLightAccentColor ?? Colors.Transparent;
-            _albumArtDarkAccentColor = e.AlbumArtDarkAccentColor ?? Colors.Transparent;
+            _albumArtLightAccentColors = e.AlbumArtLightAccentColors;
+            _albumArtDarkAccentColors = e.AlbumArtDarkAccentColors;
 
             UpdateColorConfig();
         }

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

@@ -0,0 +1,100 @@
+using BetterLyrics.WinUI3.Helper;
+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 Microsoft.UI.Xaml.Controls;
+using System;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using static Vanara.PInvoke.User32.RAWINPUT;
+
+namespace BetterLyrics.WinUI3.ViewModels
+{
+    public partial class LyricsWindowSettingsControlViewModel : BaseViewModel
+    {
+        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 LyricsWindowSettingsControlViewModel(ISettingsService settingsService, ILiveStatesService liveStatesService)
+        {
+            _settingsService = settingsService;
+            _liveStatesService = liveStatesService;
+            AppSettings = _settingsService.AppSettings;
+            AppSettings.WindowBoundsRecords.CollectionChanged += WindowBoundsRecords_CollectionChanged;
+            LiveStates = _liveStatesService.LiveStates;
+            MonitorDeviceNames = [.. MonitorHelper.GetAllMonitorDeviceNames()];
+        }
+
+        private void WindowBoundsRecords_CollectionChanged(object? sender, System.Collections.Specialized.NotifyCollectionChangedEventArgs e)
+        {
+            if (!AppSettings.WindowBoundsRecords.Any(x => x == LiveStates.LyricsWindowStatus))
+            {
+                LiveStates.LyricsWindowStatus = AppSettings.WindowBoundsRecords.FirstOrDefault();
+            }
+        }
+
+        [RelayCommand]
+        private void RefreshMonitorDeviceNames()
+        {
+            MonitorDeviceNames = [.. MonitorHelper.GetAllMonitorDeviceNames()];
+            LiveStates.LyricsWindowStatus.MonitorDeviceName = MonitorHelper.GetPrimaryMonitorDeviceName();
+        }
+
+        [RelayCommand]
+        private void CreateStandardLyricsWindowStatus()
+        {
+            AppSettings.WindowBoundsRecords.Add(LyricsWindowStatusExtensions.StandardMode());
+        }
+
+        [RelayCommand]
+        private void CreateTransparentLyricsWindowStatus()
+        {
+            AppSettings.WindowBoundsRecords.Add(LyricsWindowStatusExtensions.DesktopMode());
+        }
+
+        [RelayCommand]
+        private void CreateDockedLyricsWindowStatus()
+        {
+            AppSettings.WindowBoundsRecords.Add(LyricsWindowStatusExtensions.DockedMode());
+        }
+
+        [RelayCommand]
+        private void CreateFullLyricsWindowStatus()
+        {
+            AppSettings.WindowBoundsRecords.Add(LyricsWindowStatusExtensions.FullscreenMode(LiveStates.LyricsWindowStatus.MonitorBounds));
+        }
+
+        [RelayCommand]
+        private void CreateNarrowLyricsWindowStatus()
+        {
+            AppSettings.WindowBoundsRecords.Add(LyricsWindowStatusExtensions.NarrowMode());
+        }
+
+        [RelayCommand]
+        private void CopyLyricsWindowStatus()
+        {
+            var data = (LyricsWindowStatus)LiveStates.LyricsWindowStatus.Clone();
+            data.IsDefault = false;
+            AppSettings.WindowBoundsRecords.Add(data);
+        }
+    }
+}

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

@@ -0,0 +1,36 @@
+using BetterLyrics.WinUI3.Helper;
+using BetterLyrics.WinUI3.Models;
+using BetterLyrics.WinUI3.Models.Settings;
+using BetterLyrics.WinUI3.Services.LiveStatesService;
+using BetterLyrics.WinUI3.Services.SettingsService;
+using CommunityToolkit.Mvvm.ComponentModel;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+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)
+        {
+            _settingsService = settingsService;
+            _liveStatesService = liveStatesService;
+            AppSettings = _settingsService.AppSettings;
+            LiveStates = _liveStatesService.LiveStates;
+        }
+
+    }
+}

BetterLyrics.WinUI3/BetterLyrics.WinUI3/ViewModels/LyricsWindowViewModel.cs

@@ -21,6 +21,7 @@ using Microsoft.UI.Xaml;
 using Microsoft.UI.Xaml.Controls;
 using System.Collections.Generic;
 using Vanara.PInvoke;
+using Windows.Foundation;
 using Windows.System;
 using Windows.UI;
 using WinRT.Interop;
@@ -30,24 +31,14 @@ namespace BetterLyrics.WinUI3
 {
     public partial class LyricsWindowViewModel
         : BaseWindowViewModel,
-            IRecipient<PropertyChangedMessage<int>>,
             IRecipient<PropertyChangedMessage<List<string>>>,
-            IRecipient<PropertyChangedMessage<bool>>,
-            IRecipient<PropertyChangedMessage<string>>,
-            IRecipient<PropertyChangedMessage<ElementTheme>>,
-            IRecipient<PropertyChangedMessage<DockPlacement>>
+            IRecipient<PropertyChangedMessage<ElementTheme>>
     {
         private readonly IMediaSessionsService _mediaSessionsService;
         private readonly ISettingsService _settingsService;
         private readonly ILiveStatesService _liveStatesService;
 
-        private ForegroundWindowWatcher? _windowWatcher = null;
-        private bool _ignoreFullscreenWindow;
-        private bool _hideWindowWhenNotPlaying;
-
-        private DockPlacement _dockPlacement;
-        private int _dockWindowHeight;
-        private string _dockMonitorDeviceName;
+        private ForegroundWindowWatcher? _fgWindowWatcher = null;
 
         public LyricsWindowViewModel(ISettingsService settingsService, IMediaSessionsService mediaSessionsService, ILiveStatesService liveStatesService)
         {
@@ -58,12 +49,7 @@ namespace BetterLyrics.WinUI3
             AppSettings = _settingsService.AppSettings;
             LiveStates = _liveStatesService.LiveStates;
 
-            _dockMonitorDeviceName = _settingsService.AppSettings.DockModeSettings.DockMonitorDeviceName;
-            _ignoreFullscreenWindow = _settingsService.AppSettings.GeneralSettings.IgnoreFullscreenWindow;
-            _hideWindowWhenNotPlaying = _settingsService.AppSettings.GeneralSettings.HideWindowWhenNotPlaying;
             IsImmersiveMode = _settingsService.AppSettings.GeneralSettings.IsImmersiveMode;
-            _dockPlacement = _settingsService.AppSettings.DockModeSettings.DockPlacement;
-            _dockWindowHeight = _settingsService.AppSettings.DockModeSettings.DockWindowHeight;
             OnIsImmersiveModeChanged(_settingsService.AppSettings.GeneralSettings.IsImmersiveMode);
 
             _mediaSessionsService.IsPlayingChanged += PlaybackService_IsPlayingChanged;
@@ -71,79 +57,27 @@ namespace BetterLyrics.WinUI3
 
         private void PlaybackService_IsPlayingChanged(object? sender, Events.IsPlayingChangedEventArgs e)
         {
-            UpdateDockOrDesktopWindow();
+            WindowHelper.SetLyricsWindowVisibilityByPlayingStatus();
         }
 
-        [ObservableProperty]
-        public partial AppSettings AppSettings { get; set; }
+        [ObservableProperty] public partial AppSettings AppSettings { get; set; }
 
-        [ObservableProperty]
-        public partial LiveStates LiveStates { get; set; }
+        [ObservableProperty] public partial LiveStates LiveStates { get; set; }
 
-        [ObservableProperty]
-        [NotifyPropertyChangedRecipients]
-        public partial Color ActivatedWindowAccentColor { get; set; }
+        /// <summary>
+        /// 歌词窗口所在的背景主题色
+        /// </summary>
+        [ObservableProperty][NotifyPropertyChangedRecipients] public partial Color BackdropAccentColor { get; set; }
 
-        [ObservableProperty]
-        [NotifyPropertyChangedRecipients]
-        public partial bool IsLyricsWindowLocked { get; set; } = false;
+        [ObservableProperty][NotifyPropertyChangedRecipients] public partial bool IsImmersiveMode { get; set; }
 
-        [ObservableProperty]
-        [NotifyPropertyChangedRecipients]
-        public partial bool IsImmersiveMode { get; set; }
+        [ObservableProperty] public partial double TopCommandGridOpacity { get; set; }
 
-        [ObservableProperty]
-        public partial double TopCommandGridOpacity { get; set; }
+        [ObservableProperty] public partial ElementTheme ThemeType { get; set; } = ElementTheme.Default;
 
-        [ObservableProperty]
-        public partial ElementTheme ThemeType { get; set; } = ElementTheme.Default;
+        [ObservableProperty] public partial double TitleBarFontSize { get; set; } = 11;
 
-        [ObservableProperty]
-        public partial double TitleBarFontSize { get; set; } = 11;
-
-        [ObservableProperty]
-        [NotifyPropertyChangedRecipients]
-        public partial bool IsMouseWithinWindow { get; set; } = false;
-
-        [ObservableProperty] public partial Visibility FullScreenFlyoutItemVisibility { get; set; } = Visibility.Visible;
-        [ObservableProperty] public partial Visibility LockButtonVisibility { get; set; } = Visibility.Visible;
-        [ObservableProperty] public partial Visibility DesktopFlyoutItemVisibility { get; set; } = Visibility.Visible;
-        [ObservableProperty] public partial Visibility PIPFlyoutItemVisibility { get; set; } = Visibility.Visible;
-        [ObservableProperty] public partial Visibility DockFlyoutItemVisibility { get; set; } = Visibility.Visible;
-
-        [ObservableProperty] public partial bool IsFullScreenFlyoutItemChecked { get; set; } = false;
-        [ObservableProperty] public partial bool IsDesktopFlyoutItemChecked { get; set; } = false;
-        [ObservableProperty] public partial bool IsPIPFlyoutItemChecked { get; set; } = false;
-        [ObservableProperty] public partial bool IsDockFlyoutItemChecked { get; set; } = false;
-
-        private void UpdateDockOrDesktopWindow()
-        {
-
-            var window = WindowHelper.GetWindowByWindowType<LyricsWindow>();
-            if (window == null) return;
-
-            var hwnd = WindowNative.GetWindowHandle(window);
-
-            if (LiveStates.LyricsWindowMode == LyricsWindowMode.DockMode || LiveStates.LyricsWindowMode == LyricsWindowMode.DesktopMode)
-            {
-                if (_hideWindowWhenNotPlaying && !_mediaSessionsService.IsPlaying)
-                {
-                    if (LiveStates.LyricsWindowMode == LyricsWindowMode.DockMode)
-                    {
-                        DockModeHelper.UpdateAppBarHeight(hwnd, _dockMonitorDeviceName, 0, _dockPlacement);
-                    }
-                    window.Hide();
-                }
-                else
-                {
-                    if (LiveStates.LyricsWindowMode == LyricsWindowMode.DockMode)
-                    {
-                        DockModeHelper.UpdateAppBarHeight(hwnd, _dockMonitorDeviceName, _dockWindowHeight, _dockPlacement);
-                    }
-                    window.Show();
-                }
-            }
-        }
+        [ObservableProperty] public partial Visibility CloseButtonVisibility { get; set; } = Visibility.Visible;
 
         partial void OnIsImmersiveModeChanged(bool value)
         {
@@ -157,70 +91,12 @@ namespace BetterLyrics.WinUI3
             }
         }
 
-        public void Receive(PropertyChangedMessage<bool> message)
-        {
-            if (message.Sender is SystemTrayViewModel)
-            {
-                if (message.PropertyName == nameof(SystemTrayViewModel.IsLyricsWindowLocked))
-                {
-                    if (IsLyricsWindowLocked != message.NewValue)
-                    {
-                        IsLyricsWindowLocked = message.NewValue;
-                    }
-                }
-            }
-            else if (message.Sender is GeneralSettings)
-            {
-                if (message.PropertyName == nameof(GeneralSettings.IgnoreFullscreenWindow))
-                {
-                    _ignoreFullscreenWindow = message.NewValue;
-                    SetIsAlwaysOnTop();
-                }
-                else if (message.PropertyName == nameof(GeneralSettings.HideWindowWhenNotPlaying))
-                {
-                    _hideWindowWhenNotPlaying = message.NewValue;
-                    UpdateDockOrDesktopWindow();
-                }
-            }
-            else if (message.Sender is LiveStates)
-            {
-                if (message.PropertyName == nameof(LiveStates.IsAlwaysOnTop))
-                {
-                    SetIsAlwaysOnTop();
-                }
-            }
-        }
-
-        public void Receive(PropertyChangedMessage<ElementTheme> message)
-        {
-            if (message.Sender is LyricsRendererViewModel)
-            {
-                if (message.PropertyName == nameof(LyricsRendererViewModel.ThemeTypeSent))
-                {
-                    ThemeType = message.NewValue;
-                }
-            }
-        }
-
-        public void Receive(PropertyChangedMessage<int> message)
-        {
-            if (message.Sender is DockModeSettings)
-            {
-                if (message.PropertyName == nameof(DockModeSettings.DockWindowHeight))
-                {
-                    _dockWindowHeight = message.NewValue;
-                    UpdateDockOrDesktopWindow();
-                }
-            }
-        }
-
         public void InitShortcuts()
         {
-            UpdateDesktopLockUnlockShortcut();
-            UpdateDesktopToggleShortcut();
-            UpdateDockToggleShortcut();
-            UpdatePictureInPictureToggleShortcut();
+            UpdateLyricsWindowBorderlessShortcut();
+            UpdateLyricsWindowClickThroughShortcut();
             UpdateLyricsWindowShowHideShortcut();
+            UpdateLyricsWindowSwitchShortcut();
         }
 
         private void UpdateLyricsWindowShowHideShortcut()
@@ -231,162 +107,84 @@ namespace BetterLyrics.WinUI3
                 {
                     var window = WindowHelper.GetWindowByWindowType<LyricsWindow>();
                     if (window == null) return;
+
                     if (window.Visible)
                     {
                         window.Hide();
                     }
                     else
                     {
-                        WindowHelper.OpenWindow<LyricsWindow>();
+                        WindowHelper.OpenOrShowWindow<LyricsWindow>();
                     }
                 }
             );
         }
 
-        private void UpdateDesktopLockUnlockShortcut()
+        private void UpdateLyricsWindowBorderlessShortcut()
         {
-            GlobalHotKeyHelper.UpdateHotKey<LyricsWindow>(ShortcutID.DesktopLockOrUnlock,
-                _settingsService.AppSettings.DesktopModeSettings.LockShortcut,
+            GlobalHotKeyHelper.UpdateHotKey<LyricsWindow>(ShortcutID.Borderless,
+                _settingsService.AppSettings.GeneralSettings.BorderlessShortcut,
                 () =>
                 {
-                    if (LiveStates.LyricsWindowMode == LyricsWindowMode.DesktopMode)
-                    {
-                        ToggleLockWindow();
-                    }
+                    LiveStates.LyricsWindowStatus.IsBorderless = !LiveStates.LyricsWindowStatus.IsBorderless;
                 }
             );
         }
 
-        private void UpdateDesktopToggleShortcut()
+        private void UpdateLyricsWindowClickThroughShortcut()
         {
-            GlobalHotKeyHelper.UpdateHotKey<LyricsWindow>(ShortcutID.DesktopToggle,
-                _settingsService.AppSettings.DesktopModeSettings.ToggleShortcut,
+            GlobalHotKeyHelper.UpdateHotKey<LyricsWindow>(ShortcutID.ClickThrough,
+                _settingsService.AppSettings.GeneralSettings.ClickThroughShortcut,
                 () =>
                 {
-                    if (LiveStates.LyricsWindowMode == LyricsWindowMode.DesktopMode ||
-                        LiveStates.LyricsWindowMode == LyricsWindowMode.StandardMode)
-                    {
-                        ToggleDesktopMode();
-                    }
+                    LiveStates.LyricsWindowStatus.IsClickThrough = !LiveStates.LyricsWindowStatus.IsClickThrough;
                 }
             );
         }
 
-        private void UpdateDockToggleShortcut()
+        private void UpdateLyricsWindowSwitchShortcut()
         {
-            GlobalHotKeyHelper.UpdateHotKey<LyricsWindow>(ShortcutID.DockToggle,
-                _settingsService.AppSettings.DockModeSettings.ToggleShortcut,
+            GlobalHotKeyHelper.UpdateHotKey<LyricsWindow>(ShortcutID.LyricsWindowSwitch,
+                _settingsService.AppSettings.GeneralSettings.LyricsWindowSwitchShortcut,
                 () =>
                 {
-                    if (LiveStates.LyricsWindowMode == LyricsWindowMode.DockMode ||
-                        LiveStates.LyricsWindowMode == LyricsWindowMode.StandardMode)
-                    {
-                        ToggleDockMode();
-                    }
+                    WindowHelper.OpenOrShowWindow<LyricsWindowSwitchWindow>();
                 }
             );
         }
 
-        private void UpdatePictureInPictureToggleShortcut()
-        {
-            GlobalHotKeyHelper.UpdateHotKey<LyricsWindow>(ShortcutID.PictureInPictureToggle,
-                _settingsService.AppSettings.PictureInPictureModeSettings.ToggleShortcut,
-                () =>
-                {
-                    if (LiveStates.LyricsWindowMode == LyricsWindowMode.PictureInPictureMode ||
-                        LiveStates.LyricsWindowMode == LyricsWindowMode.StandardMode)
-                    {
-                        TogglePictureInPictureMode();
-                    }
-                }
-            );
-        }
-
-        private void SetFullscreenTitleBarControlsStatus()
-        {
-            LockButtonVisibility = DesktopFlyoutItemVisibility = PIPFlyoutItemVisibility = DockFlyoutItemVisibility = Visibility.Collapsed;
-            IsFullScreenFlyoutItemChecked = true;
-            IsImmersiveMode = true;
-        }
-
-        private void SetPIPModeTitleBarControlsStatus()
-        {
-            DesktopFlyoutItemVisibility = FullScreenFlyoutItemVisibility = DockFlyoutItemVisibility = LockButtonVisibility = Visibility.Collapsed;
-            IsImmersiveMode = true;
-            IsPIPFlyoutItemChecked = true;
-        }
-
-        private void SetDockModeTitleBarControlsStatus()
-        {
-            var window = WindowHelper.GetWindowByWindowType<LyricsWindow>();
-            if (window == null) return;
-            var overlappedPresenter = (OverlappedPresenter)window.AppWindow.Presenter;
-
-            overlappedPresenter.IsMinimizable = overlappedPresenter.IsMaximizable = false;
-            DesktopFlyoutItemVisibility = LockButtonVisibility = FullScreenFlyoutItemVisibility = PIPFlyoutItemVisibility = Visibility.Collapsed;
-            IsImmersiveMode = true;
-            IsDockFlyoutItemChecked = true;
-        }
-
-        private void SetDesktopModeTitleBarControlsStatus()
-        {
-            var window = WindowHelper.GetWindowByWindowType<LyricsWindow>();
-            if (window == null) return;
-            var overlappedPresenter = (OverlappedPresenter)window.AppWindow.Presenter;
-
-            overlappedPresenter.IsMinimizable = overlappedPresenter.IsMaximizable = false;
-            DockFlyoutItemVisibility = FullScreenFlyoutItemVisibility = PIPFlyoutItemVisibility = Visibility.Collapsed;
-            LockButtonVisibility = Visibility.Visible;
-            IsDesktopFlyoutItemChecked = true;
-        }
-
-        public void SetStandardModeTitleBarControlsStatus()
-        {
-            var window = WindowHelper.GetWindowByWindowType<LyricsWindow>();
-            if (window == null) return;
-            var overlappedPresenter = (OverlappedPresenter)window.AppWindow.Presenter;
-
-            overlappedPresenter.IsMinimizable = overlappedPresenter.IsMaximizable = true;
-            DesktopFlyoutItemVisibility = DockFlyoutItemVisibility = PIPFlyoutItemVisibility = FullScreenFlyoutItemVisibility = Visibility.Visible;
-            LockButtonVisibility = Visibility.Collapsed;
-            IsFullScreenFlyoutItemChecked = IsDesktopFlyoutItemChecked = IsDockFlyoutItemChecked = IsPIPFlyoutItemChecked = false;
-            IsImmersiveMode = _settingsService.AppSettings.GeneralSettings.IsImmersiveMode;
-        }
-
-        public void StartWatchWindowColorChange()
+        public void InitFgWindowWatcher()
         {
             var window = WindowHelper.GetWindowByWindowType<LyricsWindow>();
             if (window == null) return;
 
             var hwnd = WindowNative.GetWindowHandle(window);
-            _windowWatcher = new ForegroundWindowWatcher(
+            _fgWindowWatcher = new ForegroundWindowWatcher(
                 hwnd,
                 fgHwnd =>
                 {
                     _dispatcherQueueTimer.Debounce(() =>
                     {
-                        if ((LiveStates.LyricsWindowMode == LyricsWindowMode.DockMode || LiveStates.LyricsWindowMode == LyricsWindowMode.DesktopMode) && _ignoreFullscreenWindow && window.AppWindow.Presenter is OverlappedPresenter presenter)
+                        if (_liveStatesService.LiveStates.LyricsWindowStatus.IsAlwaysOnTop &&
+                            _liveStatesService.LiveStates.LyricsWindowStatus.IsAlwaysOnTopPolling &&
+                            window.AppWindow.Presenter is OverlappedPresenter presenter)
                         {
                             presenter.IsAlwaysOnTop = true;
                         }
-                        UpdateAccentColor(hwnd);
+                        UpdateBackdropAccentColor(hwnd);
                     }, Constants.Time.DebounceTimeout);
                 }
             );
-            _windowWatcher.Start();
-            UpdateAccentColor(hwnd);
+            _fgWindowWatcher.Start();
+            UpdateBackdropAccentColor(hwnd);
         }
 
-        private void StopWatchWindowColorChange()
+        public void UpdateBackdropAccentColor(nint hwnd)
         {
-            _windowWatcher?.Stop();
-            _windowWatcher = null;
-        }
-
-        public void UpdateAccentColor(nint hwnd)
-        {
-            WindowPixelSampleMode mode = LiveStates.LyricsWindowMode == LyricsWindowMode.DesktopMode ? WindowPixelSampleMode.WindowEdge : _dockPlacement.ToWindowPixelSampleMode();
-            ActivatedWindowAccentColor = ColorHelper.GetAccentColor(hwnd, _settingsService.AppSettings.DockModeSettings.DockMonitorDeviceName, mode).ToColor();
+            BackdropAccentColor = ColorHelper.GetAccentColor(
+                hwnd,
+                _liveStatesService.LiveStates.LyricsWindowStatus.MonitorDeviceName,
+                _liveStatesService.LiveStates.LyricsWindowStatus.EnvironmentSampleMode).ToColor();
         }
 
         public void ExitOrClose()
@@ -402,131 +200,9 @@ namespace BetterLyrics.WinUI3
             }
         }
 
-        public void ToggleLockWindow()
+        public void RefreshLyricsWindowStatus()
         {
-            var window = WindowHelper.GetWindowByWindowType<LyricsWindow>();
-            if (window == null) return;
-
-            if (IsLyricsWindowLocked)
-            {
-                DesktopModeHelper.SetClickThrough(window, false);
-                IsLyricsWindowLocked = false;
-                IsImmersiveMode = _settingsService.AppSettings.GeneralSettings.IsImmersiveMode;
-            }
-            else
-            {
-                DesktopModeHelper.SetClickThrough(window, true);
-                IsLyricsWindowLocked = true;
-                IsImmersiveMode = true;
-            }
-
-            UpdateDockOrDesktopWindow();
-        }
-
-        public void ToggleDesktopMode()
-        {
-            var window = WindowHelper.GetWindowByWindowType<LyricsWindow>();
-            if (window == null) return;
-
-            StopWatchWindowColorChange();
-
-            LiveStates.ToggleLyricsWindowMode(LyricsWindowMode.DesktopMode);
-            if (LiveStates.LyricsWindowMode == LyricsWindowMode.DesktopMode)
-            {
-                DesktopModeHelper.Enable(window);
-                StartWatchWindowColorChange();
-                if (_settingsService.AppSettings.DesktopModeSettings.AutoLockOnDesktopMode)
-                {
-                    ToggleLockWindow();
-                }
-                SetDesktopModeTitleBarControlsStatus();
-            }
-            else
-            {
-                if (IsLyricsWindowLocked)
-                {
-                    ToggleLockWindow();
-                }
-                DesktopModeHelper.Disable(window);
-                SetStandardModeTitleBarControlsStatus();
-            }
-            SetIsAlwaysOnTop();
-        }
-
-        public void ToggleDockMode()
-        {
-            var window = WindowHelper.GetWindowByWindowType<LyricsWindow>();
-            if (window == null) return;
-
-            StopWatchWindowColorChange();
-
-            LiveStates.ToggleLyricsWindowMode(LyricsWindowMode.DockMode);
-            if (LiveStates.LyricsWindowMode == LyricsWindowMode.DockMode)
-            {
-                window.Restore();
-                DockModeHelper.Enable(window, _dockMonitorDeviceName, _dockWindowHeight, _dockPlacement);
-                StartWatchWindowColorChange();
-                SetDockModeTitleBarControlsStatus();
-            }
-            else
-            {
-                DockModeHelper.Disable(window);
-                SetStandardModeTitleBarControlsStatus();
-            }
-
-            UpdateDockOrDesktopWindow();
-            SetIsAlwaysOnTop();
-        }
-
-        public void TogglePictureInPictureMode()
-        {
-            var window = WindowHelper.GetWindowByWindowType<LyricsWindow>();
-            if (window == null) return;
-
-            LiveStates.ToggleLyricsWindowMode(LyricsWindowMode.PictureInPictureMode);
-            if (LiveStates.LyricsWindowMode == LyricsWindowMode.PictureInPictureMode)
-            {
-                window.AppWindow.SetPresenter(AppWindowPresenterKind.CompactOverlay);
-                window.AppWindow.Move(AppSettings.PictureInPictureModeSettings.WindowPosition.ToPointInt32());
-                SetPIPModeTitleBarControlsStatus();
-            }
-            else
-            {
-                window.AppWindow.SetPresenter(AppWindowPresenterKind.Overlapped);
-                SetStandardModeTitleBarControlsStatus();
-            }
-            SetIsAlwaysOnTop();
-        }
-
-        public void SetIsAlwaysOnTop()
-        {
-            var window = WindowHelper.GetWindowByWindowType<LyricsWindow>();
-            if (window == null) return;
-
-            if (window.AppWindow.Presenter is OverlappedPresenter presenter)
-            {
-                presenter.IsAlwaysOnTop = _liveStatesService.LiveStates.IsAlwaysOnTop;
-            }
-        }
-
-        public void ToggleFullscreen()
-        {
-            var window = WindowHelper.GetWindowByWindowType<LyricsWindow>();
-            if (window == null) return;
-
-            switch (window.AppWindow.Presenter.Kind)
-            {
-                case AppWindowPresenterKind.FullScreen:
-                    window.AppWindow.SetPresenter(AppWindowPresenterKind.Overlapped);
-                    SetStandardModeTitleBarControlsStatus();
-                    break;
-                case AppWindowPresenterKind.Overlapped:
-                    window.AppWindow.SetPresenter(AppWindowPresenterKind.FullScreen);
-                    SetFullscreenTitleBarControlsStatus();
-                    break;
-                default:
-                    break;
-            }
+            _liveStatesService.RefreshLyricsWindowStatus();
         }
 
         [RelayCommand]
@@ -535,58 +211,20 @@ namespace BetterLyrics.WinUI3
             _settingsService.AppSettings.GeneralSettings.IsImmersiveMode = IsImmersiveMode;
         }
 
-        public void Receive(PropertyChangedMessage<DockPlacement> message)
-        {
-            if (message.Sender is DockModeSettings)
-            {
-                if (message.PropertyName == nameof(DockModeSettings.DockPlacement))
-                {
-                    _dockPlacement = message.NewValue;
-                    UpdateDockOrDesktopWindow();
-                }
-            }
-        }
-
-        public void Receive(PropertyChangedMessage<string> message)
-        {
-            if (message.Sender is DockModeSettings)
-            {
-                if (message.PropertyName == nameof(DockModeSettings.DockMonitorDeviceName))
-                {
-                    _dockMonitorDeviceName = message.NewValue;
-                    UpdateDockOrDesktopWindow();
-                }
-            }
-        }
-
         public void Receive(PropertyChangedMessage<List<string>> message)
         {
-            if (message.Sender is DesktopModeSettings)
+            if (message.Sender is GeneralSettings)
             {
-                if (message.PropertyName == nameof(DesktopModeSettings.LockShortcut))
+                if (message.PropertyName == nameof(GeneralSettings.ClickThroughShortcut))
                 {
-                    UpdateDesktopLockUnlockShortcut();
+                    UpdateLyricsWindowClickThroughShortcut();
                 }
             }
-            else if (message.Sender is DockModeSettings)
+            else if (message.Sender is GeneralSettings)
             {
-                if (message.PropertyName == nameof(DockModeSettings.ToggleShortcut))
+                if (message.PropertyName == nameof(GeneralSettings.BorderlessShortcut))
                 {
-                    UpdateDockToggleShortcut();
-                }
-            }
-            else if (message.Sender is PictureInPictureModeSettings)
-            {
-                if (message.PropertyName == nameof(PictureInPictureModeSettings.ToggleShortcut))
-                {
-                    UpdatePictureInPictureToggleShortcut();
-                }
-            }
-            else if (message.Sender is DesktopModeSettings)
-            {
-                if (message.PropertyName == nameof(DesktopModeSettings.ToggleShortcut))
-                {
-                    UpdateDesktopToggleShortcut();
+                    UpdateLyricsWindowBorderlessShortcut();
                 }
             }
             else if (message.Sender is GeneralSettings)
@@ -596,6 +234,24 @@ namespace BetterLyrics.WinUI3
                     UpdateLyricsWindowShowHideShortcut();
                 }
             }
+            else if (message.Sender is GeneralSettings)
+            {
+                if (message.PropertyName == nameof(GeneralSettings.LyricsWindowSwitchShortcut))
+                {
+                    UpdateLyricsWindowSwitchShortcut();
+                }
+            }
+        }
+
+        public void Receive(PropertyChangedMessage<ElementTheme> message)
+        {
+            if (message.Sender is LyricsRendererViewModel)
+            {
+                if (message.PropertyName == nameof(LyricsRendererViewModel.ThemeTypeSent))
+                {
+                    ThemeType = message.NewValue;
+                }
+            }
         }
     }
 }

BetterLyrics.WinUI3/BetterLyrics.WinUI3/ViewModels/SettingsPageViewModel.cs

@@ -23,6 +23,7 @@ using System.IO;
 using System.Linq;
 using System.Threading.Tasks;
 using Windows.ApplicationModel;
+using Windows.Services.Store;
 using WinRT.Interop;
 
 namespace BetterLyrics.WinUI3.ViewModels
@@ -60,13 +61,19 @@ namespace BetterLyrics.WinUI3.ViewModels
         [RelayCommand]
         private static async Task OpenCacheFolderAsync()
         {
-            await Windows.System.Launcher.LaunchFolderPathAsync(Helper.PathHelper.CacheFolder);
+            await Windows.System.Launcher.LaunchFolderPathAsync(PathHelper.CacheFolder);
+        }
+
+        [RelayCommand]
+        private static async Task OpenSettingsFolderAsync()
+        {
+            await Windows.System.Launcher.LaunchFolderPathAsync(PathHelper.LocalFolder);
         }
 
         [RelayCommand]
         private static void RestartApp()
         {
-            Helper.WindowHelper.RestartApp();
+            WindowHelper.RestartApp();
         }
 
         [RelayCommand]

BetterLyrics.WinUI3/BetterLyrics.WinUI3/ViewModels/SystemTrayViewModel.cs

@@ -11,31 +11,11 @@ using WinUIEx;
 
 namespace BetterLyrics.WinUI3.ViewModels
 {
-    public partial class SystemTrayViewModel(ISettingsService settingsService) : BaseViewModel, IRecipient<PropertyChangedMessage<bool>>
+    public partial class SystemTrayViewModel(ISettingsService settingsService) : BaseViewModel
     {
-        private readonly ISettingsService _settingsService = settingsService;
-
-        [ObservableProperty]
-        [NotifyPropertyChangedRecipients]
-        public partial bool IsLyricsWindowLocked { get; set; } = false;
-
         [ObservableProperty]
         public partial string ToolTipText { get; set; } = Constants.App.AppName;
 
-        public void Receive(PropertyChangedMessage<bool> message)
-        {
-            if (message.Sender is LyricsWindowViewModel)
-            {
-                if (message.PropertyName == nameof(LyricsWindowViewModel.IsLyricsWindowLocked))
-                {
-                    if (IsLyricsWindowLocked != message.NewValue)
-                    {
-                        IsLyricsWindowLocked = message.NewValue;
-                    }
-                }
-            }
-        }
-
         [RelayCommand]
         private static void ExitApp()
         {
@@ -51,39 +31,26 @@ namespace BetterLyrics.WinUI3.ViewModels
         [RelayCommand]
         private static void ResetWindowPosition()
         {
-            LyricsWindow? lyricsWindow = WindowHelper.GetWindowByWindowType<LyricsWindow>();
-            if (lyricsWindow != null)
-            {
-                lyricsWindow.MoveAndResize(0, 0, 800, 600);
-            }
+            var lyricsWindow = WindowHelper.GetWindowByWindowType<LyricsWindow>();
+            lyricsWindow?.MoveAndResize(100, 100, 800, 500);
         }
 
         [RelayCommand]
         private static void OpenSettings()
         {
-            WindowHelper.OpenWindow<SettingsWindow>();
+            WindowHelper.OpenOrShowWindow<SettingsWindow>();
         }
 
         [RelayCommand]
         private static void OpenMusicGallery()
         {
-            WindowHelper.OpenWindow<MusicGalleryWindow>();
+            WindowHelper.OpenOrShowWindow<MusicGalleryWindow>();
         }
 
         [RelayCommand]
         private static void OpenLyrics()
         {
-            WindowHelper.OpenWindow<LyricsWindow>();
-        }
-
-        [RelayCommand]
-        private void UnlockWindow()
-        {
-            var window = WindowHelper.GetWindowByWindowType<LyricsWindow>();
-            if (window == null) return;
-
-            DesktopModeHelper.SetClickThrough(window, false);
-            IsLyricsWindowLocked = false;
+            WindowHelper.OpenOrShowWindow<LyricsWindow>();
         }
     }
 }

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Views/LyricsPage.xaml

@@ -29,8 +29,8 @@
                 x:Uid="MainPageNoMusicPlaying"
                 HorizontalAlignment="Center"
                 VerticalAlignment="Center"
-                FontFamily="{x:Bind ViewModel.LiveStates.LyricsStyleSettings.LyricsFontFamily, Mode=OneWay}"
-                FontSize="{x:Bind ViewModel.LiveStates.LyricsStyleSettings.LyricsFontSize, Mode=OneWay}" />
+                FontFamily="{x:Bind ViewModel.LiveStates.LyricsWindowStatus.LyricsStyleSettings.LyricsFontFamily, Mode=OneWay}"
+                FontSize="{x:Bind ViewModel.LiveStates.LyricsWindowStatus.LyricsStyleSettings.LyricsFontSize, Mode=OneWay}" />
             <Grid.OpacityTransition>
                 <ScalarTransition />
             </Grid.OpacityTransition>
@@ -219,10 +219,21 @@
                             </Button.DataContext>
                         </Button>-->
 
+                        <Button
+                            Click="LyricsSearchShortcutButton_Click"
+                            Content="{ui:FontIcon FontFamily={StaticResource IconFontFamily},
+                                                  Glyph=&#xE721;}"
+                            Style="{StaticResource GhostButtonStyle}">
+                            <ToolTipService.ToolTip>
+                                <ToolTip x:Uid="LyricsPageLyricsSearchButtonToolTip" />
+                            </ToolTipService.ToolTip>
+                        </Button>
+
+                        <!--  Lyrics window manager shortcut settings  -->
                         <Button
                             Click="LyricsSettingsShortcutButton_Click"
                             Content="{ui:FontIcon FontFamily={StaticResource IconFontFamily},
-                                                  Glyph=&#xEDC6;}"
+                                                  Glyph=&#xE61F;}"
                             Style="{StaticResource GhostButtonStyle}">
                             <ToolTipService.ToolTip>
                                 <ToolTip x:Uid="LyricsPageLyricsSettingsButtonToolTip" />
@@ -237,16 +248,6 @@
                             </Button.ContextFlyout>
                         </Button>
 
-                        <Button
-                            Click="LyricsSearchShortcutButton_Click"
-                            Content="{ui:FontIcon FontFamily={StaticResource IconFontFamily},
-                                                  Glyph=&#xE721;}"
-                            Style="{StaticResource GhostButtonStyle}">
-                            <ToolTipService.ToolTip>
-                                <ToolTip x:Uid="LyricsPageLyricsSearchButtonToolTip" />
-                            </ToolTipService.ToolTip>
-                        </Button>
-
                         <!--  Playback shortcut settings  -->
                         <Button
                             Click="PlaybackSettingsShortcutButton_Click"

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Views/LyricsPage.xaml.cs

@@ -124,7 +124,7 @@ namespace BetterLyrics.WinUI3.Views
 
         private void LyricsSettingsShortcutButton_Click(object sender, RoutedEventArgs e)
         {
-            LyricsSettingsFlyout.Content = new AllLyricsSettingsControl
+            LyricsSettingsFlyout.Content = new LyricsWindowSettingsControl
             {
                 MaxHeight = 500,
                 MaxWidth = 850,
@@ -134,7 +134,7 @@ namespace BetterLyrics.WinUI3.Views
 
         private void LyricsSearchShortcutButton_Click(object sender, RoutedEventArgs e)
         {
-            WindowHelper.OpenWindow<LyricsSearchWindow>();
+            WindowHelper.OpenOrShowWindow<LyricsSearchWindow>();
         }
 
         private void TimelineSliderOverlay_PointerPressed(object sender, Microsoft.UI.Xaml.Input.PointerRoutedEventArgs e)

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Views/LyricsWindow.xaml

@@ -5,20 +5,21 @@
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:behaviors="using:CommunityToolkit.WinUI.Behaviors"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-    xmlns:interactivity="using:Microsoft.Xaml.Interactivity"
     xmlns:local="using:BetterLyrics.WinUI3.Views"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     xmlns:media="using:CommunityToolkit.WinUI.Media"
     xmlns:scontrols="using:ShadowViewer.Controls"
+    xmlns:uc="using:BetterLyrics.WinUI3.Controls"
     xmlns:ui="using:CommunityToolkit.WinUI"
     mc:Ignorable="d">
 
-    <Grid
-        x:Name="RootGrid"
-        PointerEntered="RootGrid_PointerEntered"
-        PointerExited="RootGrid_PointerExited"
-        RequestedTheme="{x:Bind ViewModel.ThemeType, Mode=OneWay}"
-        SizeChanged="RootGrid_SizeChanged">
+    <Grid x:Name="RootGrid" RequestedTheme="{x:Bind ViewModel.ThemeType, Mode=OneWay}">
+        <Grid
+            x:Name="PlaceholderGrid"
+            Width="1"
+            Height="1"
+            HorizontalAlignment="Left"
+            VerticalAlignment="Top" />
 
         <local:LyricsPage />
 
@@ -45,91 +46,15 @@
                         <ScalarTransition />
                     </StackPanel.OpacityTransition>
 
-                    <!--  Look  -->
-                    <Button
-                        x:Name="ClickThroughButton"
-                        Click="ClickThroughButton_Click"
-                        Style="{StaticResource TitleBarButtonStyle}"
-                        Visibility="{x:Bind ViewModel.LockButtonVisibility, Mode=OneWay}">
-                        <FontIcon
-                            FontFamily="{StaticResource IconFontFamily}"
-                            FontSize="{x:Bind ViewModel.TitleBarFontSize, Mode=OneWay}"
-                            Glyph="&#xE72E;" />
-                        <ToolTipService.ToolTip>
-                            <ToolTip x:Name="LockToolTip">
-                                <ToolTip.Content>
-                                    <StackPanel Orientation="Horizontal">
-                                        <TextBlock x:Uid="HostWindowLockToolTip" />
-                                    </StackPanel>
-                                </ToolTip.Content>
-                            </ToolTip>
-                        </ToolTipService.ToolTip>
-                    </Button>
                     <!--  More  -->
-                    <Button x:Name="MoreButton" Style="{StaticResource TitleBarButtonStyle}">
+                    <Button Click="MusicGalleryButton_Click" Style="{StaticResource TitleBarButtonStyle}">
                         <FontIcon
                             FontFamily="{StaticResource IconFontFamily}"
                             FontSize="{x:Bind ViewModel.TitleBarFontSize, Mode=OneWay}"
-                            Glyph="&#xE700;" />
+                            Glyph="&#xE8F1;" />
                         <ToolTipService.ToolTip>
-                            <ToolTip x:Name="MoreButtonToolTip" x:Uid="HostWindowMoreButtonToolTip" />
+                            <ToolTip x:Uid="HostWindowMusicGalleryButtonToolTip" />
                         </ToolTipService.ToolTip>
-                        <Button.Flyout>
-                            <MenuFlyout>
-                                <ToggleMenuFlyoutItem
-                                    x:Name="FullScreenFlyoutItem"
-                                    x:Uid="BaseWindowFullScreenFlyoutItem"
-                                    Click="FullScreenFlyoutItem_Click"
-                                    Icon="{ui:FontIcon FontFamily={StaticResource IconFontFamily},
-                                                       Glyph=&#xE740;}"
-                                    IsChecked="{x:Bind ViewModel.IsFullScreenFlyoutItemChecked, Mode=OneWay}"
-                                    Visibility="{x:Bind ViewModel.FullScreenFlyoutItemVisibility, Mode=OneWay}" />
-                                <MenuFlyoutSeparator />
-                                <ToggleMenuFlyoutItem
-                                    x:Name="DockFlyoutItem"
-                                    x:Uid="HostWindowDockFlyoutItem"
-                                    Click="DockFlyoutItem_Click"
-                                    Icon="{ui:FontIcon FontFamily={StaticResource IconFontFamily},
-                                                       Glyph=&#xE7B5;}"
-                                    IsChecked="{x:Bind ViewModel.IsDockFlyoutItemChecked, Mode=OneWay}"
-                                    Visibility="{x:Bind ViewModel.DockFlyoutItemVisibility, Mode=OneWay}" />
-                                <ToggleMenuFlyoutItem
-                                    x:Name="DesktopFlyoutItem"
-                                    x:Uid="HostWindowDesktopFlyoutItem"
-                                    Click="DesktopFlyoutItem_Click"
-                                    Icon="{ui:FontIcon FontFamily={StaticResource IconFontFamily},
-                                                       Glyph=&#xE75A;}"
-                                    IsChecked="{x:Bind ViewModel.IsDesktopFlyoutItemChecked, Mode=OneWay}"
-                                    Visibility="{x:Bind ViewModel.DesktopFlyoutItemVisibility, Mode=OneWay}" />
-                                <ToggleMenuFlyoutItem
-                                    x:Name="PIPFlyoutItem"
-                                    x:Uid="BaseWindowMiniFlyoutItem"
-                                    Click="PIPFlyoutItem_Click"
-                                    Icon="{ui:FontIcon FontFamily={StaticResource IconFontFamily},
-                                                       Glyph=&#xEE49;}"
-                                    IsChecked="{x:Bind ViewModel.IsPIPFlyoutItemChecked, Mode=OneWay}"
-                                    Visibility="{x:Bind ViewModel.PIPFlyoutItemVisibility, Mode=OneWay}" />
-                                <MenuFlyoutSeparator />
-                                <MenuFlyoutItem
-                                    x:Name="MusicGalleryFlyoutItem"
-                                    x:Uid="SystemTrayMusicGallery"
-                                    Click="MusicGalleryMenuFlyoutItem_Click"
-                                    Icon="{ui:FontIcon FontFamily={StaticResource IconFontFamily},
-                                                       Glyph=&#xEA69;}" />
-                                <MenuFlyoutItem
-                                    x:Name="SettingsFlyoutItem"
-                                    x:Uid="SystemTraySettings"
-                                    Click="SettingsMenuFlyoutItem_Click"
-                                    Icon="{ui:FontIcon FontFamily={StaticResource IconFontFamily},
-                                                       Glyph=&#xE713;}" />
-                                <MenuFlyoutSeparator />
-                                <MenuFlyoutItem
-                                    x:Uid="SystemTrayExit"
-                                    Click="ExitAppMenuFlyoutItem_Click"
-                                    Icon="{ui:FontIcon FontFamily={StaticResource IconFontFamily},
-                                                       Glyph=&#xE7E8;}" />
-                            </MenuFlyout>
-                        </Button.Flyout>
                     </Button>
                     <!--  Immersive mode  -->
                     <ToggleButton
@@ -145,6 +70,7 @@
                             FontSize="{x:Bind ViewModel.TitleBarFontSize}"
                             Glyph="&#xED1A;" />
                     </ToggleButton>
+
                 </StackPanel>
             </Grid>
 
@@ -156,6 +82,19 @@
                     <StackPanel.OpacityTransition>
                         <ScalarTransition />
                     </StackPanel.OpacityTransition>
+
+                    <!--  Window Close  -->
+                    <Button
+                        x:Name="CloseButton"
+                        Click="CloseButton_Click"
+                        Style="{StaticResource TitleBarButtonStyle}"
+                        Visibility="{x:Bind ViewModel.CloseButtonVisibility, Mode=OneWay}">
+                        <FontIcon
+                            FontFamily="{StaticResource IconFontFamily}"
+                            FontSize="{x:Bind ViewModel.TitleBarFontSize, Mode=OneWay}"
+                            Glyph="&#xE653;" />
+                    </Button>
+
                 </StackPanel>
             </Grid>
 

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Views/LyricsWindow.xaml.cs

@@ -2,14 +2,18 @@
 
 using BetterLyrics.WinUI3.Enums;
 using BetterLyrics.WinUI3.Helper;
+using BetterLyrics.WinUI3.Models;
 using BetterLyrics.WinUI3.Services.LiveStatesService;
 using BetterLyrics.WinUI3.Services.SettingsService;
 using CommunityToolkit.Mvvm.DependencyInjection;
 using CommunityToolkit.WinUI;
 using Microsoft.UI.Windowing;
 using Microsoft.UI.Xaml;
+using Microsoft.UI.Xaml.Controls;
 using Microsoft.UI.Xaml.Input;
 using System;
+using System.Diagnostics;
+using System.Linq;
 using Vanara.PInvoke;
 using WinRT.Interop;
 using WinUIEx;
@@ -22,7 +26,6 @@ namespace BetterLyrics.WinUI3.Views
         private readonly ISettingsService _settingsService = Ioc.Default.GetRequiredService<ISettingsService>();
         private readonly ILiveStatesService _liveStatesService = Ioc.Default.GetRequiredService<ILiveStatesService>();
         private readonly WindowMessageMonitor _wmm;
-        private bool _autoSelectLyricsModeOnRunning = true;
 
         public LyricsWindow()
         {
@@ -33,7 +36,7 @@ namespace BetterLyrics.WinUI3.Views
             AppWindow.Changed += AppWindow_Changed;
 
             ExtendsContentIntoTitleBar = true;
-            UpdateTitleBarArea();
+            AppWindow.TitleBar.PreferredHeightOption = TitleBarHeightOption.Collapsed;
 
             Title = App.ResourceLoader!.GetString("LyricsPageTitle");
 
@@ -49,15 +52,21 @@ namespace BetterLyrics.WinUI3.Views
             args.Cancel = true;
         }
 
-        public void UpdateTitleBarArea()
+        public void SetTitleBarArea(TitleBarArea titleBarArea)
         {
-            if (_settingsService.AppSettings.GeneralSettings.IsDragEverywhereEnabled)
+            switch (titleBarArea)
             {
-                SetTitleBar(RootGrid);
-            }
-            else
-            {
-                SetTitleBar(TopCommandGrid);
+                case TitleBarArea.None:
+                    SetTitleBar(PlaceholderGrid);
+                    break;
+                case TitleBarArea.Top:
+                    SetTitleBar(TopCommandGrid);
+                    break;
+                case TitleBarArea.Whole:
+                    SetTitleBar(RootGrid);
+                    break;
+                default:
+                    break;
             }
         }
 
@@ -72,104 +81,24 @@ namespace BetterLyrics.WinUI3.Views
 
         public LyricsWindowViewModel ViewModel { get; private set; } = Ioc.Default.GetRequiredService<LyricsWindowViewModel>();
 
-        public void AutoSelectLyricsMode(LyricsWindowMode? type = null)
-        {
-            type ??= _settingsService.AppSettings.GeneralSettings.AutoStartWindowType;
-            switch (type!)
-            {
-                case LyricsWindowMode.StandardMode:
-                    ViewModel.SetStandardModeTitleBarControlsStatus();
-                    if (_settingsService.AppSettings.StandardModeSettings.IsMaximized)
-                    {
-                        // <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ʱ<EFBFBD><CAB1><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ô<EFBFBD><C3B4>ڴ<EFBFBD>С<EFBFBD>Ա<EFBFBD><D4B1>˳<EFBFBD><CBB3><EFBFBD><EFBFBD>󻯺<EFBFBD>
-                        // <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ܶ<EFBFBD><DCB6><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Ļ<EFBFBD><C4BB>ԵӰ<D4B5><D3B0><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
-                        this.Maximize();
-                    }
-                    else
-                    {
-                        AppWindow.MoveAndResize(_settingsService.AppSettings.StandardModeSettings.WindowBounds.ToRectInt32());
-                    }
-                    break;
-                case LyricsWindowMode.DockMode:
-                    ViewModel.ToggleDockMode();
-                    break;
-                case LyricsWindowMode.DesktopMode:
-                    ViewModel.ToggleDesktopMode();
-                    break;
-                case LyricsWindowMode.PictureInPictureMode:
-                    ViewModel.TogglePictureInPictureMode();
-                    break;
-                default:
-                    break;
-            }
-            _autoSelectLyricsModeOnRunning = false;
-
-            var size = AppWindow.Size;
-            var rect = AppWindow.Position;
-
-            _liveStatesService.LiveStates.LyricsWindowBounds = new Windows.Foundation.Rect(rect.X, rect.Y, size.Width, size.Height);
-        }
-
         private void AppWindow_Changed(AppWindow sender, AppWindowChangedEventArgs args)
         {
-            if (_autoSelectLyricsModeOnRunning) return;
-
             if (args.DidPositionChange || args.DidSizeChange)
             {
                 var size = AppWindow.Size;
                 var rect = AppWindow.Position;
 
-                _liveStatesService.LiveStates.LyricsWindowBounds = new Windows.Foundation.Rect(rect.X, rect.Y, size.Width, size.Height);
-
                 if (rect.X < 0 && rect.Y < 0 && rect.X + size.Width < 0 && rect.Y + size.Height < 0)
                 {
                     return;
                 }
                 else
                 {
-                    switch (ViewModel.LiveStates.LyricsWindowMode)
-                    {
-                        case LyricsWindowMode.StandardMode:
-                            if (AppWindow.Presenter is OverlappedPresenter overlappedPresenter)
-                            {
-                                _settingsService.AppSettings.StandardModeSettings.WindowBounds = new Windows.Foundation.Rect(rect.X, rect.Y, size.Width, size.Height);
-                                _settingsService.AppSettings.StandardModeSettings.IsMaximized = overlappedPresenter.State == OverlappedPresenterState.Maximized;
-                            }
-                            break;
-                        case LyricsWindowMode.DockMode:
-                            break;
-                        case LyricsWindowMode.DesktopMode:
-                            _settingsService.AppSettings.DesktopModeSettings.WindowBounds = new Windows.Foundation.Rect(rect.X, rect.Y, size.Width, size.Height);
-                            break;
-                        case LyricsWindowMode.PictureInPictureMode:
-                            if (AppWindow.Presenter is CompactOverlayPresenter compactOverlayPresenter)
-                            {
-                                _settingsService.AppSettings.PictureInPictureModeSettings.WindowPosition = new Windows.Foundation.Point(rect.X, rect.Y);
-                            }
-                            break;
-                        default:
-                            break;
-                    }
+                    _liveStatesService.LiveStates.LyricsWindowStatus.WindowBounds = new Windows.Foundation.Rect(rect.X, rect.Y, size.Width, size.Height);
                 }
             }
         }
 
-        private void FullScreenFlyoutItem_Click(object sender, RoutedEventArgs e)
-        {
-
-            ViewModel.ToggleFullscreen();
-        }
-
-        private void PIPFlyoutItem_Click(object sender, RoutedEventArgs e)
-        {
-            ViewModel.TogglePictureInPictureMode();
-        }
-
-        private void SettingsMenuFlyoutItem_Click(object sender, RoutedEventArgs e)
-        {
-            WindowHelper.OpenWindow<SettingsWindow>();
-        }
-
         private void TopCommandGrid_PointerEntered(object sender, PointerRoutedEventArgs e)
         {
             if (ViewModel.IsImmersiveMode)
@@ -186,50 +115,19 @@ namespace BetterLyrics.WinUI3.Views
             }
         }
 
-        private void RootGrid_PointerEntered(object sender, PointerRoutedEventArgs e)
+        private void MusicGalleryButton_Click(object sender, RoutedEventArgs e)
         {
-            ViewModel.IsMouseWithinWindow = true;
-            e.Handled = true;
-        }
-
-        private void RootGrid_PointerExited(object sender, PointerRoutedEventArgs e)
-        {
-            ViewModel.IsMouseWithinWindow = false;
-            e.Handled = true;
-        }
-
-        private void RootGrid_SizeChanged(object sender, SizeChangedEventArgs e)
-        {
-        }
-
-        private void ClickThroughButton_Click(object sender, RoutedEventArgs e)
-        {
-            ViewModel.ToggleLockWindow();
-        }
-
-        private void DockFlyoutItem_Click(object sender, RoutedEventArgs e)
-        {
-            ViewModel.ToggleDockMode();
-        }
-
-        private void DesktopFlyoutItem_Click(object sender, RoutedEventArgs e)
-        {
-            ViewModel.ToggleDesktopMode();
-        }
-
-        private void MusicGalleryMenuFlyoutItem_Click(object sender, RoutedEventArgs e)
-        {
-            WindowHelper.OpenWindow<MusicGalleryWindow>();
-        }
-
-        private void ExitAppMenuFlyoutItem_Click(object sender, RoutedEventArgs e)
-        {
-            WindowHelper.ExitApp();
+            WindowHelper.OpenOrShowWindow<MusicGalleryWindow>();
         }
 
         private void TipContainerCenter_Loaded(object sender, RoutedEventArgs e)
         {
             App.Current.LyricsWindowNotificationPanel = TipContainerCenter;
         }
+
+        private void CloseButton_Click(object sender, RoutedEventArgs e)
+        {
+            ViewModel.ExitOrClose();
+        }
     }
 }

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Views/LyricsWindowSwitchWindow.xaml

@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<Window
+    x:Class="BetterLyrics.WinUI3.Views.LyricsWindowSwitchWindow"
+    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:local="using:BetterLyrics.WinUI3.Views"
+    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    xmlns:uc="using:BetterLyrics.WinUI3.Controls"
+    Title="LyricsWindowSwitchWindow"
+    mc:Ignorable="d">
+
+    <Grid>
+        <Grid
+            x:Name="PlaceholderGrid"
+            Width="1"
+            Height="1"
+            HorizontalAlignment="Left"
+            VerticalAlignment="Top" />
+        <uc:LyricsWindowSwitchControl />
+    </Grid>
+</Window>

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Views/LyricsWindowSwitchWindow.xaml.cs

@@ -0,0 +1,42 @@
+using BetterLyrics.WinUI3.Helper;
+using Microsoft.UI.Xaml;
+using Microsoft.UI.Xaml.Controls;
+using Microsoft.UI.Xaml.Controls.Primitives;
+using Microsoft.UI.Xaml.Data;
+using Microsoft.UI.Xaml.Input;
+using Microsoft.UI.Xaml.Media;
+using Microsoft.UI.Xaml.Navigation;
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Runtime.InteropServices.WindowsRuntime;
+using Windows.Foundation;
+using Windows.Foundation.Collections;
+using WinUIEx;
+
+// 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.Views
+{
+    /// <summary>
+    /// An empty window that can be used on its own or navigated to within a Frame.
+    /// </summary>
+    public sealed partial class LyricsWindowSwitchWindow : Window
+    {
+        public LyricsWindowSwitchWindow()
+        {
+            InitializeComponent();
+
+            AppWindow.TitleBar.ExtendsContentIntoTitleBar = true;
+            AppWindow.TitleBar.PreferredHeightOption = Microsoft.UI.Windowing.TitleBarHeightOption.Collapsed;
+            this.CenterOnScreen();
+            this.SystemBackdrop = SystemBackdropHelper.CreateSystemBackdrop(Enums.BackdropType.Transparent);
+            this.SetWindowStyle(WindowStyle.Popup | WindowStyle.Visible);
+            AppWindow.IsShownInSwitchers = false;
+            this.SetIsAlwaysOnTop(true);
+            SetTitleBar(PlaceholderGrid);
+        }
+    }
+}

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Views/SettingsPage.xaml

@@ -33,10 +33,11 @@
                     Tag="App" />
 
                 <NavigationViewItem
-                    x:Uid="SettingsPageAlbumStyle"
+                    x:Uid="SettingsPageLyricsWindowMgr"
+                    Content="Lyrics window manager"
                     Icon="{ui:FontIcon FontFamily={StaticResource IconFontFamily},
-                                       Glyph=&#xE93C;}"
-                    Tag="AlbumArtStyle" />
+                                       Glyph=&#xE61F;}"
+                    Tag="LyricsWindowMgr" />
 
                 <NavigationViewItem
                     x:Uid="SettingsPageMediaLib"
@@ -50,30 +51,12 @@
                                        Glyph=&#xEA69;}"
                     Tag="PlaybackLib" />
 
-                <NavigationViewItem
-                    x:Uid="SettingsPageBackgroundOverlay"
-                    Icon="{ui:FontIcon FontFamily={StaticResource IconFontFamily},
-                                       Glyph=&#xF5EF;}"
-                    Tag="Background" />
-
-                <NavigationViewItem
-                    x:Uid="SettingsPageLyrics"
-                    Icon="{ui:FontIcon FontFamily={StaticResource IconFontFamily},
-                                       Glyph=&#xEDC6;}"
-                    Tag="Lyrics" />
-
                 <NavigationViewItem
                     x:Uid="SettingsPageAbout"
                     Icon="{ui:FontIcon FontFamily={StaticResource IconFontFamily},
                                        Glyph=&#xE946;}"
                     Tag="About" />
 
-                <NavigationViewItem
-                    x:Uid="SettingsPageDev"
-                    Icon="{ui:FontIcon FontFamily={StaticResource IconFontFamily},
-                                       Glyph=&#xEC7A;}"
-                    Tag="Dev" />
-
             </NavigationView.MenuItems>
 
             <controls:SwitchPresenter Value="{x:Bind ViewModel.NavViewSelectedItemTag, Mode=OneWay}">
@@ -88,14 +71,9 @@
                     <uc:AppSettingsControl />
                 </controls:Case>
 
-                <!--  Lyrics background  -->
-                <controls:Case Value="Background">
-                    <uc:LyricsBackgroundSettingsControl />
-                </controls:Case>
-
-                <!--  Album art area style  -->
-                <controls:Case Value="AlbumArtStyle">
-                    <uc:AlbumArtLayoutSettingsControl />
+                <!--  Lyrics window manager  -->
+                <controls:Case Value="LyricsWindowMgr">
+                    <uc:LyricsWindowSettingsControl />
                 </controls:Case>
 
                 <!--  Playback sources  -->
@@ -108,11 +86,6 @@
                     <uc:MediaSettingsControl />
                 </controls:Case>
 
-                <!--  Lyrics style and effect  -->
-                <controls:Case Value="Lyrics">
-                    <uc:AllLyricsSettingsControl />
-                </controls:Case>
-
                 <!--  About  -->
                 <controls:Case Value="About">
                     <ScrollViewer Style="{StaticResource SettingsScrollViewerStyle}">
@@ -121,12 +94,24 @@
 
                                 <TextBlock Style="{StaticResource SettingsSectionHeaderTextBlockStyle}" />
 
-                                <controls:SettingsExpander
-                                    Header="BetterLyrics"
-                                    HeaderIcon="{ui:BitmapIcon Source=ms-appx:///Assets/Logo.png}"
-                                    IsExpanded="True">
+                                <controls:SettingsExpander HeaderIcon="{ui:BitmapIcon Source=ms-appx:///Assets/Logo.png}" IsExpanded="True">
+                                    <controls:SettingsExpander.Header>
+                                        <StackPanel Orientation="Horizontal" Spacing="6">
+                                            <TextBlock Text="BetterLyrics" />
+                                        </StackPanel>
+                                    </controls:SettingsExpander.Header>
                                     <controls:SettingsExpander.Description>
-                                        <HyperlinkButton Content="by Zhe Fang" NavigateUri="https://github.com/jayfunc" />
+                                        <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>
                                     </controls:SettingsExpander.Description>
                                     <RichTextBlock Foreground="{ThemeResource TextFillColorSecondaryBrush}">
                                         <Paragraph>
@@ -206,39 +191,25 @@
                                     </controls:SettingsExpander.Items>
                                     <controls:SettingsExpander.ItemsHeader>
                                         <InfoBar
+                                            x:Uid="SettingsPageDisclaimer"
                                             BorderThickness="0"
                                             CornerRadius="0"
                                             IsClosable="False"
                                             IsOpen="True"
-                                            Severity="Warning">
-                                            <TextBlock
-                                                x:Uid="SettingsPageDisclaimer"
-                                                Margin="12"
-                                                Foreground="{ThemeResource SystemFillColorCautionBrush}"
-                                                TextWrapping="Wrap" />
-                                        </InfoBar>
+                                            Severity="Warning" />
                                     </controls:SettingsExpander.ItemsHeader>
                                 </controls:SettingsExpander>
 
-                            </StackPanel>
-                        </Grid>
-                    </ScrollViewer>
-                </controls:Case>
-
-                <!--  Dev  -->
-                <controls:Case Value="Dev">
-                    <ScrollViewer Style="{StaticResource SettingsScrollViewerStyle}">
-                        <Grid Style="{StaticResource SettingsGridStyle}">
-                            <StackPanel Spacing="{StaticResource SettingsCardSpacing}">
-
-                                <TextBlock Style="{StaticResource SettingsSectionHeaderTextBlockStyle}" />
-
                                 <controls:SettingsCard x:Uid="SettingsPageMockMusicPlaying">
                                     <HyperlinkButton x:Uid="SettingsPagePlayingMockMusicButton" NavigateUri="https://soundcloud.com/carlyraejepsen/cut-to-the-feeling" />
                                 </controls:SettingsCard>
 
                                 <controls:SettingsCard x:Uid="SettingsPageCache">
-                                    <Button x:Uid="SettingsPageOpenLogFolderButton" Command="{x:Bind ViewModel.OpenCacheFolderCommand}" />
+                                    <Button x:Uid="SettingsPageOpenFolderButton" Command="{x:Bind ViewModel.OpenCacheFolderCommand}" />
+                                </controls:SettingsCard>
+
+                                <controls:SettingsCard x:Uid="SettingsPageSettings">
+                                    <Button x:Uid="SettingsPageOpenFolderButton" Command="{x:Bind ViewModel.OpenSettingsFolderCommand}" />
                                 </controls:SettingsCard>
 
                                 <controls:SettingsExpander x:Uid="SettingsPageSettingsManager" IsExpanded="True">

FAQ/FAQ.md

@@ -1,25 +1,28 @@
-### Where I can find the logs?
-`C:\Users\%USERNAME%\AppData\Local\Packages\37412.BetterLyrics_rd1g0rsrrtxw8\LocalCache\logs`
+### ? Where I can find the logs?
+`%LocalAppData%\Packages\37412.BetterLyrics_rd1g0rsrrtxw8\LocalCache\logs`
 
-### How to install ".msixbundle" package? (for test package only)
+### ? Where I can find the lyrics cache?
+`%LocalAppData%\Packages\37412.BetterLyrics_rd1g0rsrrtxw8\LocalCache\lyrics`
+
+### ? How to install ".msixbundle" package? (for test package only)
 [See this doc](https://github.com/jayfunc/BetterLyrics/blob/dev/How2Install/How2Install.md)
 
-### Lyrics are moving back and forth constantly, how to fix it?
+### ? Lyrics are moving back and forth constantly, how to fix it?
 ![](Snipaste_2025-08-22_14-59-53.png)
 
 Go to Settings > Playback sources > Disable "Lyrics timeline sync" or increase "Lyrics timeline sync threshold"
 
-### Wrong lyrics are shown, how to fix it?
+### ? Wrong lyrics are shown, how to fix it?
 ![](Snipaste_2025-08-22_14-47-21.png)
 
 Open search panel to manually search for the correct lyrics.
 
-### Playback control panel is not showing in dock mode, how to fix it?
+### ? Playback control panel is not showing in dock mode, how to fix it?
 ![](Snipaste_2025-08-22_14-50-16.png)
 
 Hover over the bottom of the lyrics window and click on the white line to show the playback control panel.
 
-### How to lock/unlock the lyrics window in desktop mode?
+### ? How to lock/unlock the lyrics window in desktop mode?
 ![](Snipaste_2025-08-22_14-52-53.png)
 
 ![](Snipaste_2025-08-22_14-53-21.png)
@@ -30,5 +33,5 @@ Alternatively, you can also use the shortcut `Ctrl+Alt+U` (default) to toggle lo
 
 You can change the shortcut in Settings > App appearance and behavior > Unlock and lock shortcut keys
 
-### How to enable/disable immersive mode?
+### ? How to enable/disable immersive mode?
 ![](Snipaste_2025-08-22_14-58-44.png)

README.md

@@ -62,7 +62,7 @@ Check out the article: [BetterLyrics – An immersive and smooth lyrics display
 
   - <details><summary>网易云音乐</summary>
 
-    - Please make sure that you have latest version (3.1.20+) of 网易云音乐 installed on your PC.
+    - Please make sure that you have the latest version (3.1.20+) of 网易云音乐 installed on your PC.
     - Install the [BetterNCM plugin](https://microblock.cc/betterncm) first
     - After that, install the [InfLink-rs](https://github.com/apoint123/inflink-rs) plugin in PluginMarket. After the installation is complete, please restart 网易云音乐. At this point, all preparatory operations have been completed. Enjoy it!
 
@@ -138,15 +138,15 @@ Check out the article: [BetterLyrics – An immersive and smooth lyrics display
 
 ![alt text](Screenshots/std.png)
 
-### Standard mode (narrow)
+### Narrow mode
 
 ![alt text](Screenshots/std-narrow.png)
 
-### Standard mode (fullscreen)
+### Fullscreen mode
 
 ![alt text](Screenshots/std-fullscreen.png)
 
-### Dock mode
+### Docked mode
 
 ![alt text](Screenshots/dock.png)
 
@@ -182,7 +182,7 @@ Watch our introduction video (uploaded on 18 Aug 2025) on Bilibili [here](https:
 
 If you are using a third-party modified Windows, you probably can not launch the app.
 
-To solve this issue, please try to download from [Google Drive (v1.0.75.0)](https://drive.google.com/file/d/12cEnyfwM_aNjAgBoh_ru-UqjgYmSjsHY/view?usp=sharing) (may not be the latest version) and follow the instructions [here](https://github.com/jayfunc/BetterLyrics/blob/dev/How2Install/How2Install.md).
+To solve this issue, please try to download from [Google Drive (v1.0.81.0)](https://drive.google.com/file/d/1YT8Cg5unPoNJO0FBR9s4w7T2pCLIZQz9/view?usp=sharing) (may not be the latest version) and follow the instructions [here](https://github.com/jayfunc/BetterLyrics/blob/dev/How2Install/How2Install.md).
 
 ## Build
 
@@ -206,6 +206,8 @@ Before you build, make sure that you have already replaced `BetterLyrics\BetterL
   - Win32 API wrapper
 - [LibreTranslate](https://github.com/LibreTranslate/LibreTranslate)
   - Provide the ability for offline lyrics translation
+- [Isolation](https://github.com/Storyteller-Studios/Isolation)
+  - Dynamic fluid background implementation
 - [Stackoverflow - How to animate Margin property in WPF](https://stackoverflow.com/a/21542882/11048731)
 - [DevWinUI](https://github.com/ghost1372/DevWinUI)
 - [Bilibili -【WinUI3】SystemBackdropController：定义云母、亚克力效果](https://www.bilibili.com/video/BV1PY4FevEkS)