Merge branch 'dev' of https://github.com/jayfunc/BetterLyrics into dev

.github/FUNDING.yml

@@ -12,4 +12,4 @@ lfx_crowdfunding: # Replace with a single LFX Crowdfunding project-name e.g., cl
 polar: # Replace with a single Polar username
 buy_me_a_coffee: founchoo
 thanks_dev: # Replace with a single thanks.dev username
-custom: # Replace with up to 4 custom sponsorship URLs e.g., ['link1', 'link2']
+custom: ['https://paypal.me/zhefangpay']

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.59.0" />
+	  Version="1.0.61.0" />
 
 	<mp:PhoneIdentity PhoneProductId="ca4a4830-fc19-40d9-b823-53e2bff3d816" PhonePublisherId="00000000-0000-0000-0000-000000000000"/>
 

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

@@ -3,6 +3,7 @@
     x:Class="BetterLyrics.WinUI3.Controls.LyricsSearchControl"
     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:local="using:BetterLyrics.WinUI3.Controls"
@@ -12,101 +13,56 @@
 
     <Grid Padding="16" RowSpacing="6">
         <Grid.RowDefinitions>
-            <RowDefinition Height="Auto" />
-            <RowDefinition Height="Auto" />
-            <RowDefinition Height="Auto" />
-            <RowDefinition Height="Auto" />
             <RowDefinition Height="Auto" />
             <RowDefinition Height="*" />
             <RowDefinition Height="Auto" />
         </Grid.RowDefinitions>
         <Grid Grid.Row="0" Margin="0,0,0,6">
-            <TextBlock x:Uid="LyricsSearchControlSongInfoMapping" Style="{StaticResource SubtitleTextBlockStyle}" />
-        </Grid>
-        <Grid Grid.Row="1" ColumnSpacing="6">
-            <Grid.ColumnDefinitions>
-                <ColumnDefinition Width="Auto" />
-                <ColumnDefinition Width="*" />
-                <ColumnDefinition Width="Auto" />
-                <ColumnDefinition Width="*" />
-            </Grid.ColumnDefinitions>
-            <TextBlock
-                x:Uid="LyricsSearchControlTitle"
-                Grid.Column="0"
-                VerticalAlignment="Center"
-                Text="Title" />
-            <TextBox
-                Grid.Column="1"
-                IsReadOnly="True"
-                Text="{x:Bind ViewModel.MappedSongSearchQuery.OriginalTitle, Mode=OneWay}"
-                TextWrapping="Wrap" />
-            <TextBlock
-                x:Uid="LyricsSearchControlMappedAs"
-                Grid.Column="2"
-                VerticalAlignment="Center" />
-            <TextBox
-                Grid.Column="3"
-                Text="{x:Bind ViewModel.MappedSongSearchQuery.MappedTitle, Mode=TwoWay}"
-                TextWrapping="Wrap" />
-        </Grid>
-        <Grid Grid.Row="2" ColumnSpacing="6">
-            <Grid.ColumnDefinitions>
-                <ColumnDefinition Width="Auto" />
-                <ColumnDefinition Width="*" />
-                <ColumnDefinition Width="Auto" />
-                <ColumnDefinition Width="*" />
-            </Grid.ColumnDefinitions>
-            <TextBlock
-                x:Uid="LyricsSearchControlArtist"
-                Grid.Column="0"
-                VerticalAlignment="Center" />
-            <TextBox
-                Grid.Column="1"
-                IsReadOnly="True"
-                Text="{x:Bind ViewModel.MappedSongSearchQuery.OriginalArtist, Mode=OneWay}"
-                TextWrapping="Wrap" />
-            <TextBlock
-                x:Uid="LyricsSearchControlMappedAs"
-                Grid.Column="2"
-                VerticalAlignment="Center" />
-            <TextBox
-                Grid.Column="3"
-                Text="{x:Bind ViewModel.MappedSongSearchQuery.MappedArtist, Mode=TwoWay}"
-                TextWrapping="Wrap" />
-        </Grid>
-        <!--  搜索及其他按钮  -->
-        <Grid Grid.Row="3">
-            <RelativePanel>
-                <CheckBox
-                    x:Uid="LyricsSearchControlMarkAsPureMusic"
-                    IsChecked="{x:Bind ViewModel.MappedSongSearchQuery.IsMarkedAsPureMusic, Mode=TwoWay}"
-                    RelativePanel.AlignLeftWithPanel="True"
-                    RelativePanel.AlignVerticalCenterWithPanel="True" />
-                <Button
-                    x:Uid="LyricsSearchControlSearch"
-                    Command="{x:Bind ViewModel.SearchCommand}"
-                    RelativePanel.AlignRightWithPanel="True"
-                    RelativePanel.AlignVerticalCenterWithPanel="True"
-                    Style="{StaticResource AccentButtonStyle}" />
-            </RelativePanel>
-        </Grid>
-        <Grid Grid.Row="4">
-            <Grid.ColumnDefinitions>
-                <ColumnDefinition Width="*" />
-                <ColumnDefinition Width="2*" />
-            </Grid.ColumnDefinitions>
-            <Grid Grid.Column="0">
-                <TextBlock x:Uid="LyricsSearchControlTargetSearchProvider" Style="{StaticResource SubtitleTextBlockStyle}" />
-            </Grid>
-            <Grid Grid.Column="1">
-                <TextBlock
-                    x:Uid="LyricsSearchControlLyricsPreview"
-                    Margin="6,0,0,0"
-                    Style="{StaticResource SubtitleTextBlockStyle}" />
-            </Grid>
+            <StackPanel Spacing="{StaticResource SettingsCardSpacing}">
+                <controls:SettingsExpander x:Uid="LyricsSearchControlSongInfoMapping" IsExpanded="True">
+                    <controls:SettingsExpander.Items>
+                        <controls:SettingsCard x:Uid="LyricsSearchControlTitle" Description="{x:Bind ViewModel.MappedSongSearchQuery.OriginalTitle, Mode=OneWay}">
+                            <StackPanel Orientation="Horizontal" Spacing="6">
+                                <TextBlock x:Uid="LyricsSearchControlMappedAs" VerticalAlignment="Center" />
+                                <TextBox Text="{x:Bind ViewModel.MappedSongSearchQuery.MappedTitle, Mode=TwoWay}" TextWrapping="Wrap" />
+                                <Button
+                                    VerticalAlignment="Center"
+                                    Command="{x:Bind ViewModel.ResetMappedTitleCommand}"
+                                    Content="{ui:FontIcon FontFamily={StaticResource IconFontFamily},
+                                                          FontSize=12,
+                                                          Glyph=&#xE777;}"
+                                    Style="{StaticResource GhostButtonStyle}" />
+                            </StackPanel>
+                        </controls:SettingsCard>
+                        <controls:SettingsCard x:Uid="LyricsSearchControlArtist" Description="{x:Bind ViewModel.MappedSongSearchQuery.OriginalArtist, Mode=OneWay}">
+                            <StackPanel Orientation="Horizontal" Spacing="6">
+                                <TextBlock x:Uid="LyricsSearchControlMappedAs" VerticalAlignment="Center" />
+                                <TextBox Text="{x:Bind ViewModel.MappedSongSearchQuery.MappedArtist, Mode=TwoWay}" TextWrapping="Wrap" />
+                                <Button
+                                    VerticalAlignment="Center"
+                                    Command="{x:Bind ViewModel.ResetMappedArtistCommand}"
+                                    Content="{ui:FontIcon FontFamily={StaticResource IconFontFamily},
+                                                          FontSize=12,
+                                                          Glyph=&#xE777;}"
+                                    Style="{StaticResource GhostButtonStyle}" />
+                            </StackPanel>
+                        </controls:SettingsCard>
+                        <controls:SettingsCard>
+                            <CheckBox x:Uid="LyricsSearchControlMarkAsPureMusic" IsChecked="{x:Bind ViewModel.MappedSongSearchQuery.IsMarkedAsPureMusic, Mode=TwoWay}" />
+                        </controls:SettingsCard>
+                    </controls:SettingsExpander.Items>
+                </controls:SettingsExpander>
+
+                <controls:SettingsCard x:Uid="LyricsSearchControlTargetSearchProvider">
+                    <Button
+                        x:Uid="LyricsSearchControlSearch"
+                        Command="{x:Bind ViewModel.SearchCommand}"
+                        Style="{StaticResource AccentButtonStyle}" />
+                </controls:SettingsCard>
+            </StackPanel>
         </Grid>
         <!--  结果列表及原始歌词文件展示区域  -->
-        <Grid Grid.Row="5">
+        <Grid Grid.Row="1">
             <Grid.ColumnDefinitions>
                 <ColumnDefinition Width="*" />
                 <ColumnDefinition Width="2*" />
@@ -189,16 +145,16 @@
                     Visibility="{x:Bind ViewModel.IsSearching, Converter={StaticResource BoolToVisibilityConverter}, Mode=OneWay}" />
             </Grid>
             <Grid Grid.Column="1">
-                <ListView ItemsSource="{x:Bind ViewModel.LyricsData.LyricsLines, Mode=OneWay}">
+                <ListView ItemsSource="{x:Bind ViewModel.LyricsData.LyricsLines, Mode=OneWay}" SelectedItem="{x:Bind ViewModel.SelectedLyricsLine, Mode=TwoWay}">
                     <interactivity:Interaction.Behaviors>
                         <interactivity:DataTriggerBehavior
-                            Binding="{x:Bind ViewModel.SelectedLyricsSearchResult, Mode=OneWay}"
+                            Binding="{x:Bind ViewModel.LyricsData, Mode=OneWay}"
                             ComparisonCondition="Equal"
                             Value="{x:Null}">
                             <interactivity:ChangePropertyAction PropertyName="Visibility" Value="Collapsed" />
                         </interactivity:DataTriggerBehavior>
                         <interactivity:DataTriggerBehavior
-                            Binding="{x:Bind ViewModel.SelectedLyricsSearchResult, Mode=OneWay}"
+                            Binding="{x:Bind ViewModel.LyricsData, Mode=OneWay}"
                             ComparisonCondition="NotEqual"
                             Value="{x:Null}">
                             <interactivity:ChangePropertyAction PropertyName="Visibility" Value="Visible" />
@@ -226,13 +182,13 @@
                     <Image MaxWidth="100" Source="/Assets/Page.png" />
                     <interactivity:Interaction.Behaviors>
                         <interactivity:DataTriggerBehavior
-                            Binding="{x:Bind ViewModel.SelectedLyricsSearchResult, Mode=OneWay}"
+                            Binding="{x:Bind ViewModel.LyricsData, Mode=OneWay}"
                             ComparisonCondition="NotEqual"
                             Value="{x:Null}">
                             <interactivity:ChangePropertyAction PropertyName="Visibility" Value="Collapsed" />
                         </interactivity:DataTriggerBehavior>
                         <interactivity:DataTriggerBehavior
-                            Binding="{x:Bind ViewModel.SelectedLyricsSearchResult, Mode=OneWay}"
+                            Binding="{x:Bind ViewModel.LyricsData, Mode=OneWay}"
                             ComparisonCondition="Equal"
                             Value="{x:Null}">
                             <interactivity:ChangePropertyAction PropertyName="Visibility" Value="Visible" />
@@ -241,13 +197,13 @@
                 </StackPanel>
             </Grid>
         </Grid>
-        <Grid Grid.Row="6">
+        <Grid Grid.Row="2">
             <RelativePanel>
                 <TextBlock
                     x:Uid="LyricsSearchControlHelp"
                     Margin="0,0,24,0"
                     FontSize="12"
-                    Foreground="{StaticResource TextFillColorSecondaryBrush}"
+                    Foreground="{ThemeResource TextFillColorSecondaryBrush}"
                     RelativePanel.AlignVerticalCenterWithPanel="True"
                     RelativePanel.LeftOf="Reset"
                     TextWrapping="Wrap" />

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Helper/CanvasHelper.cs

@@ -74,9 +74,17 @@ namespace BetterLyrics.WinUI3.Helper
             using var ds = list.CreateDrawingSession();
             if (strokeWidth > 0)
             {
+                if (lyricsLine.TextGeometry == null)
+                {
+                    return list;
+                }
                 ds.DrawGeometry(lyricsLine.TextGeometry, lyricsLine.Position, strokeColor, strokeWidth); // 描边
             }
-            ds.FillGeometry(lyricsLine.TextGeometry, lyricsLine.Position, fontColor); // 填充
+            if (lyricsLine.CanvasTextLayout == null)
+            {
+                return list;
+            }
+            ds.DrawTextLayout(lyricsLine.CanvasTextLayout, lyricsLine.Position, fontColor); // 绘制文本（填充）
             return list;
         }
 

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

@@ -116,15 +116,11 @@ namespace BetterLyrics.WinUI3.Helper
             {
                 case WindowPixelSampleMode.BelowWindow:
                     {
-                        int sampleHeight = 1;
-                        int sampleY = myRect.Bottom + 1;
-                        return GetAverageColorFromScreenRegion(myRect.Left, sampleY, screenWidth, sampleHeight);
+                        return GetAverageColorFromScreenRegion(myRect.Left, myRect.Bottom + 2, screenWidth, 1);
                     }
                 case WindowPixelSampleMode.AboveWindow:
                     {
-                        int sampleHeight = 1;
-                        int sampleY = myRect.Top - 1;
-                        return GetAverageColorFromScreenRegion(myRect.Left, sampleY, screenWidth, sampleHeight);
+                        return GetAverageColorFromScreenRegion(myRect.Left, myRect.Top - 3, screenWidth, 1);
                     }
                 case WindowPixelSampleMode.WindowArea:
                     {

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

@@ -11,6 +11,6 @@ namespace BetterLyrics.WinUI3.Helper
 {
     public static class FontHelper
     {
-        public static string[] SystemFontFamilies => CanvasTextFormat.GetSystemFontFamilies();
+        public static string[] SystemFontFamilies => CanvasTextFormat.GetSystemFontFamilies().Order().ToArray();
     }
 }

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

@@ -120,5 +120,18 @@ namespace BetterLyrics.WinUI3.Models
                 },
             ]);
         }
+
+        public LyricsLine? GetLyricsLine(double sec)
+        {
+            for (int i = 0; i < LyricsLines.Count; i++)
+            {
+                var line = LyricsLines[i];
+                if (line.StartMs > sec * 1000)
+                {
+                    return LyricsLines.ElementAtOrDefault(i - 1);
+                }
+            }
+            return null;
+        }
     }
 }

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

@@ -30,6 +30,7 @@ namespace BetterLyrics.WinUI3.Services.MediaSessionsService
         bool IsPlaying { get; }
         SongInfo? SongInfo { get; }
         TimeSpan Position { get; }
+        LyricsData? CurrentLyricsData { get; }
 
         LyricsSearchProvider? LyricsSearchProvider { get; }
         TranslationSearchProvider? TranslationSearchProvider { get; }

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

@@ -58,7 +58,8 @@ namespace BetterLyrics.WinUI3.Services.MediaSessionsService
             var decoder = await BitmapDecoder.CreateAsync(stream);
             token.ThrowIfCancellationRequested();
 
-            var albumArtSwBitmap = await decoder.GetSoftwareBitmapAsync(BitmapPixelFormat.Rgba16, BitmapAlphaMode.Premultiplied);
+            var albumArtSwBitmap = await decoder.GetSoftwareBitmapAsync(BitmapPixelFormat.Rgba8, BitmapAlphaMode.Premultiplied);
+            albumArtSwBitmap = SoftwareBitmap.Copy(albumArtSwBitmap);
             token.ThrowIfCancellationRequested();
 
             var albumArtLightAccentColor = ImageHelper.GetAccentColorsFromByte(bytes, 1, false).FirstOrDefault();

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

@@ -22,7 +22,7 @@ namespace BetterLyrics.WinUI3.Services.MediaSessionsService
         private int _langIndex = 0;
         private List<LyricsData> _lyricsDataArr = [];
 
-        private LyricsData? CurrentLyricsData => _lyricsDataArr.ElementAtOrDefault(_langIndex);
+        public LyricsData? CurrentLyricsData => _lyricsDataArr.ElementAtOrDefault(_langIndex);
 
         public event EventHandler<LyricsChangedEventArgs>? LyricsChanged;
 

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

@@ -252,15 +252,12 @@
   <data name="LyricsPageTranslationProviderPrefix.Header" xml:space="preserve">
     <value>Translation provider</value>
   </data>
-  <data name="LyricsSearchControlArtist.Text" xml:space="preserve">
+  <data name="LyricsSearchControlArtist.Header" xml:space="preserve">
     <value>Artist</value>
   </data>
   <data name="LyricsSearchControlHelp.Text" xml:space="preserve">
     <value>* Save changes take effect immediately, after which the track lyrics will be retrieved with mapping information and target lyrics; marking as pure music will directly return to pure music placeholder lyrics. Reset to retrieve by original data.</value>
   </data>
-  <data name="LyricsSearchControlLyricsPreview.Text" xml:space="preserve">
-    <value>Lyrics preview</value>
-  </data>
   <data name="LyricsSearchControlMappedAs.Text" xml:space="preserve">
     <value>mapped as</value>
   </data>
@@ -279,13 +276,13 @@
   <data name="LyricsSearchControlSearch.Content" xml:space="preserve">
     <value>Search</value>
   </data>
-  <data name="LyricsSearchControlSongInfoMapping.Text" xml:space="preserve">
+  <data name="LyricsSearchControlSongInfoMapping.Header" xml:space="preserve">
     <value>Song info mapping</value>
   </data>
-  <data name="LyricsSearchControlTargetSearchProvider.Text" xml:space="preserve">
+  <data name="LyricsSearchControlTargetSearchProvider.Header" xml:space="preserve">
     <value>Target lyrics search provider</value>
   </data>
-  <data name="LyricsSearchControlTitle.Text" xml:space="preserve">
+  <data name="LyricsSearchControlTitle.Header" xml:space="preserve">
     <value>Title</value>
   </data>
   <data name="LyricsSearchProviderEslrcFile" xml:space="preserve">

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

@@ -252,15 +252,12 @@
   <data name="LyricsPageTranslationProviderPrefix.Header" xml:space="preserve">
     <value>翻訳プロバイダー</value>
   </data>
-  <data name="LyricsSearchControlArtist.Text" xml:space="preserve">
+  <data name="LyricsSearchControlArtist.Header" xml:space="preserve">
     <value>アーティスト</value>
   </data>
   <data name="LyricsSearchControlHelp.Text" xml:space="preserve">
     <value>*保存変更はすぐに有効になります。その後、トラックの歌詞がマッピング情報とターゲット歌詞で取得されます。純粋な音楽としてのマーキングは、純粋な音楽プレースホルダーの歌詞に直接戻ります。元のデータで取得するためにリセット。</value>
   </data>
-  <data name="LyricsSearchControlLyricsPreview.Text" xml:space="preserve">
-    <value>歌詞プレビュー</value>
-  </data>
   <data name="LyricsSearchControlMappedAs.Text" xml:space="preserve">
     <value>としてマッピングされました</value>
   </data>
@@ -279,13 +276,13 @@
   <data name="LyricsSearchControlSearch.Content" xml:space="preserve">
     <value>検索する</value>
   </data>
-  <data name="LyricsSearchControlSongInfoMapping.Text" xml:space="preserve">
+  <data name="LyricsSearchControlSongInfoMapping.Header" xml:space="preserve">
     <value>曲情報マッピング</value>
   </data>
-  <data name="LyricsSearchControlTargetSearchProvider.Text" xml:space="preserve">
+  <data name="LyricsSearchControlTargetSearchProvider.Header" xml:space="preserve">
     <value>ターゲット歌詞検索プロバイダー</value>
   </data>
-  <data name="LyricsSearchControlTitle.Text" xml:space="preserve">
+  <data name="LyricsSearchControlTitle.Header" xml:space="preserve">
     <value>タイトル</value>
   </data>
   <data name="LyricsSearchProviderEslrcFile" xml:space="preserve">
@@ -877,15 +874,15 @@
   <data name="SettingsPageLyricsThin.Content" xml:space="preserve">
     <value>薄い</value>
   </data>
+  <data name="SettingsPageLyricsTimeline.Header" xml:space="preserve">
+    <value>歌詞のタイムラインを同期</value>
+  </data>
   <data name="SettingsPageLyricsTimelineThreshold.Description" xml:space="preserve">
     <value>歌詞の進行が不安定な場合は、このしきい値を増やしてみてください。この値を変更すると、歌詞の同期が逸脱する可能性があります</value>
   </data>
   <data name="SettingsPageLyricsTimelineThreshold.Header" xml:space="preserve">
     <value>歌詞タイムライン同期しきい値</value>
   </data>
-  <data name="SettingsPageLyricsTimeline.Header" xml:space="preserve">
-    <value>歌詞のタイムラインを同期</value>
-  </data>
   <data name="SettingsPageLyricsTranslationHighlight.Header" xml:space="preserve">
     <value>翻訳ハイライト</value>
   </data>

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

@@ -252,15 +252,12 @@
   <data name="LyricsPageTranslationProviderPrefix.Header" xml:space="preserve">
     <value>번역 제공자</value>
   </data>
-  <data name="LyricsSearchControlArtist.Text" xml:space="preserve">
+  <data name="LyricsSearchControlArtist.Header" xml:space="preserve">
     <value>아티스트</value>
   </data>
   <data name="LyricsSearchControlHelp.Text" xml:space="preserve">
     <value>* 변경 사항 저장 변경은 즉시 적용되며, 그 후 트랙 가사는 맵핑 정보와 대상 가사로 검색됩니다. 순수한 음악으로 표시하면 순수한 음악 자리 표시 자 가사로 직접 돌아갑니다. 원래 데이터로 검색하도록 재설정하십시오.</value>
   </data>
-  <data name="LyricsSearchControlLyricsPreview.Text" xml:space="preserve">
-    <value>가사 미리보기</value>
-  </data>
   <data name="LyricsSearchControlMappedAs.Text" xml:space="preserve">
     <value>로 매핑됨</value>
   </data>
@@ -279,13 +276,13 @@
   <data name="LyricsSearchControlSearch.Content" xml:space="preserve">
     <value>검색</value>
   </data>
-  <data name="LyricsSearchControlSongInfoMapping.Text" xml:space="preserve">
+  <data name="LyricsSearchControlSongInfoMapping.Header" xml:space="preserve">
     <value>노래 정보 매핑</value>
   </data>
-  <data name="LyricsSearchControlTargetSearchProvider.Text" xml:space="preserve">
+  <data name="LyricsSearchControlTargetSearchProvider.Header" xml:space="preserve">
     <value>가사 검색 공급자를 타겟팅하십시오</value>
   </data>
-  <data name="LyricsSearchControlTitle.Text" xml:space="preserve">
+  <data name="LyricsSearchControlTitle.Header" xml:space="preserve">
     <value>제목</value>
   </data>
   <data name="LyricsSearchProviderEslrcFile" xml:space="preserve">
@@ -877,15 +874,15 @@
   <data name="SettingsPageLyricsThin.Content" xml:space="preserve">
     <value>얇은</value>
   </data>
+  <data name="SettingsPageLyricsTimeline.Header" xml:space="preserve">
+    <value>가사 타임라인 동기화</value>
+  </data>
   <data name="SettingsPageLyricsTimelineThreshold.Description" xml:space="preserve">
     <value>가사 진행 상황이 불안하다면이 임계 값을 높이십시오. 이 값을 변경하면 가사가 동기화 될 수 있습니다</value>
   </data>
   <data name="SettingsPageLyricsTimelineThreshold.Header" xml:space="preserve">
     <value>가사 타임 라인 동기화 임계 값</value>
   </data>
-  <data name="SettingsPageLyricsTimeline.Header" xml:space="preserve">
-    <value>가사 타임라인 동기화</value>
-  </data>
   <data name="SettingsPageLyricsTranslationHighlight.Header" xml:space="preserve">
     <value>번역 하이라이트</value>
   </data>

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

@@ -252,15 +252,12 @@
   <data name="LyricsPageTranslationProviderPrefix.Header" xml:space="preserve">
     <value>翻译来源</value>
   </data>
-  <data name="LyricsSearchControlArtist.Text" xml:space="preserve">
+  <data name="LyricsSearchControlArtist.Header" xml:space="preserve">
     <value>艺术家</value>
   </data>
   <data name="LyricsSearchControlHelp.Text" xml:space="preserve">
     <value>* 保存更改立即生效，此后将以映射信息和目标歌词源检索该曲目歌词；标记为纯音乐将直接返回纯音乐占位歌词。重置以按原始数据检索。</value>
   </data>
-  <data name="LyricsSearchControlLyricsPreview.Text" xml:space="preserve">
-    <value>歌词预览</value>
-  </data>
   <data name="LyricsSearchControlMappedAs.Text" xml:space="preserve">
     <value>映射为</value>
   </data>
@@ -279,13 +276,13 @@
   <data name="LyricsSearchControlSearch.Content" xml:space="preserve">
     <value>搜索</value>
   </data>
-  <data name="LyricsSearchControlSongInfoMapping.Text" xml:space="preserve">
+  <data name="LyricsSearchControlSongInfoMapping.Header" xml:space="preserve">
     <value>歌曲信息映射</value>
   </data>
-  <data name="LyricsSearchControlTargetSearchProvider.Text" xml:space="preserve">
+  <data name="LyricsSearchControlTargetSearchProvider.Header" xml:space="preserve">
     <value>目标歌词搜索提供商</value>
   </data>
-  <data name="LyricsSearchControlTitle.Text" xml:space="preserve">
+  <data name="LyricsSearchControlTitle.Header" xml:space="preserve">
     <value>标题</value>
   </data>
   <data name="LyricsSearchProviderEslrcFile" xml:space="preserve">
@@ -877,15 +874,15 @@
   <data name="SettingsPageLyricsThin.Content" xml:space="preserve">
     <value>极细</value>
   </data>
+  <data name="SettingsPageLyricsTimeline.Header" xml:space="preserve">
+    <value>歌词时间轴同步</value>
+  </data>
   <data name="SettingsPageLyricsTimelineThreshold.Description" xml:space="preserve">
     <value>当歌词进度抖动时，请尝试增加该阈值；更改此值会导致歌词同步有偏差</value>
   </data>
   <data name="SettingsPageLyricsTimelineThreshold.Header" xml:space="preserve">
     <value>歌词时间轴同步阈值</value>
   </data>
-  <data name="SettingsPageLyricsTimeline.Header" xml:space="preserve">
-    <value>歌词时间轴同步</value>
-  </data>
   <data name="SettingsPageLyricsTranslationHighlight.Header" xml:space="preserve">
     <value>翻译高亮</value>
   </data>

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

@@ -252,15 +252,12 @@
   <data name="LyricsPageTranslationProviderPrefix.Header" xml:space="preserve">
     <value>翻譯來源</value>
   </data>
-  <data name="LyricsSearchControlArtist.Text" xml:space="preserve">
+  <data name="LyricsSearchControlArtist.Header" xml:space="preserve">
     <value>藝術家</value>
   </data>
   <data name="LyricsSearchControlHelp.Text" xml:space="preserve">
     <value>* 保存更改立即生效，此後將以映射信息和目標歌詞源檢索該曲目歌詞；標記為純音樂將直接返回純音樂佔位歌詞。重置以按原始數據檢索。</value>
   </data>
-  <data name="LyricsSearchControlLyricsPreview.Text" xml:space="preserve">
-    <value>歌詞預覽</value>
-  </data>
   <data name="LyricsSearchControlMappedAs.Text" xml:space="preserve">
     <value>映射爲</value>
   </data>
@@ -279,13 +276,13 @@
   <data name="LyricsSearchControlSearch.Content" xml:space="preserve">
     <value>搜索</value>
   </data>
-  <data name="LyricsSearchControlSongInfoMapping.Text" xml:space="preserve">
+  <data name="LyricsSearchControlSongInfoMapping.Header" xml:space="preserve">
     <value>歌曲信息映射</value>
   </data>
-  <data name="LyricsSearchControlTargetSearchProvider.Text" xml:space="preserve">
+  <data name="LyricsSearchControlTargetSearchProvider.Header" xml:space="preserve">
     <value>目標歌詞搜尋提供者</value>
   </data>
-  <data name="LyricsSearchControlTitle.Text" xml:space="preserve">
+  <data name="LyricsSearchControlTitle.Header" xml:space="preserve">
     <value>標題</value>
   </data>
   <data name="LyricsSearchProviderEslrcFile" xml:space="preserve">

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

@@ -102,6 +102,15 @@ namespace BetterLyrics.WinUI3.ViewModels
         [ObservableProperty]
         public partial bool IsSongPlaying { get; set; }
 
+        [ObservableProperty]
+        public partial float TimelineSliderThumbOpacity { get; set; } = 0f;
+
+        [ObservableProperty]
+        public partial LyricsLine? TimelineSliderThumbLyricsLine { get; set; }
+
+        [ObservableProperty]
+        public partial double TimelineSliderThumbSeconds { get; set; } = 0;
+
         public void Receive(PropertyChangedMessage<bool> message)
         {
             if (message.Sender is LyricsWindowViewModel)
@@ -157,6 +166,11 @@ namespace BetterLyrics.WinUI3.ViewModels
             }
         }
 
+        partial void OnTimelineSliderThumbSecondsChanged(double value)
+        {
+            TimelineSliderThumbLyricsLine = _mediaSessionsService.CurrentLyricsData?.GetLyricsLine(value);
+        }
+
         //partial void OnVolumeChanged(int value)
         //{
         //    SystemVolumeHelper.SetMasterVolume(value);

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

@@ -93,7 +93,7 @@ namespace BetterLyrics.WinUI3.ViewModels.LyricsRendererViewModel
 
             if (_isCanvasWidthChanged)
             {
-                if (_canvasWidth < 450)
+                if (_canvasWidth < 500)
                 {
                     _lyricsLayoutOrientation = LyricsLayoutOrientation.Vertical;
                 }

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

@@ -5,6 +5,7 @@ using BetterLyrics.WinUI3.Services.LyricsSearchService;
 using BetterLyrics.WinUI3.Services.MediaSessionsService;
 using BetterLyrics.WinUI3.Services.SettingsService;
 using CommunityToolkit.Mvvm.ComponentModel;
+using CommunityToolkit.Mvvm.DependencyInjection;
 using CommunityToolkit.Mvvm.Input;
 using CommunityToolkit.Mvvm.Messaging;
 using CommunityToolkit.Mvvm.Messaging.Messages;
@@ -22,6 +23,7 @@ namespace BetterLyrics.WinUI3.ViewModels
         private readonly ILyricsSearchService _lyricsSearchService;
         private readonly IMediaSessionsService _mediaSessionsService;
         private readonly ISettingsService _settingsService;
+
         private LatestOnlyTaskRunner _lyricsSearchRunner = new();
 
         [ObservableProperty]
@@ -36,6 +38,9 @@ namespace BetterLyrics.WinUI3.ViewModels
         [ObservableProperty]
         public partial LyricsData? LyricsData { get; set; }
 
+        [ObservableProperty]
+        public partial LyricsLine? SelectedLyricsLine { get; set; }
+
         [ObservableProperty]
         public partial MappedSongSearchQuery? MappedSongSearchQuery { get; set; }
 
@@ -63,6 +68,7 @@ namespace BetterLyrics.WinUI3.ViewModels
         private void InitMappedSongSearchQuery()
         {
             LyricsSearchResults.Clear();
+            LyricsData = null;
             if (_mediaSessionsService.SongInfo != null)
             {
                 var found = GetMappedSongSearchQueryFromSettings();
@@ -148,6 +154,18 @@ namespace BetterLyrics.WinUI3.ViewModels
             SelectedLyricsSearchResult = null;
         }
 
+        [RelayCommand]
+        private void ResetMappedTitle()
+        {
+            MappedSongSearchQuery?.MappedTitle = MappedSongSearchQuery?.OriginalTitle ?? string.Empty;
+        }
+
+        [RelayCommand]
+        private void ResetMappedArtist()
+        {
+            MappedSongSearchQuery?.MappedArtist = MappedSongSearchQuery?.OriginalArtist ?? string.Empty;
+        }
+
         partial void OnSelectedLyricsSearchResultChanged(LyricsSearchResult? value)
         {
             MappedSongSearchQuery?.LyricsSearchProvider = value?.Provider;
@@ -162,5 +180,14 @@ namespace BetterLyrics.WinUI3.ViewModels
                 LyricsData = null;
             }
         }
+
+        partial void OnSelectedLyricsLineChanged(LyricsLine? value)
+        {
+            if (value?.StartMs == null)
+            {
+                return;
+            }
+            _mediaSessionsService.ChangePosition(value.StartMs / 1000.0);
+        }
     }
 }

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

@@ -297,9 +297,40 @@
                     Maximum="{x:Bind ViewModel.SongDurationSeconds, Mode=OneWay}"
                     Minimum="0"
                     Style="{StaticResource GhostSliderStyle}"
-                    Tapped="TimelineSliderOverlay_Tapped"
                     ThumbToolTipValueConverter="{StaticResource SecondsToFormattedTimeConverter}"
                     Value="{x:Bind ViewModel.TimelinePositionSeconds, Mode=OneWay}" />
+                <Grid
+                    x:Name="TimelineSliderLyricsLineInfo"
+                    Margin="0,-48,0,0"
+                    Padding="8,4"
+                    HorizontalAlignment="Left"
+                    VerticalAlignment="Top"
+                    Background="{ThemeResource SolidBackgroundFillColorQuarternaryBrush}"
+                    CornerRadius="6"
+                    Opacity="{x:Bind ViewModel.TimelineSliderThumbOpacity, Mode=OneWay}">
+                    <Grid.OpacityTransition>
+                        <ScalarTransition />
+                    </Grid.OpacityTransition>
+                    <Grid.TranslationTransition>
+                        <Vector3Transition />
+                    </Grid.TranslationTransition>
+                    <StackPanel Orientation="Horizontal" Spacing="6">
+                        <TextBlock
+                            Margin="0,0,0,2"
+                            Foreground="{ThemeResource TextFillColorSecondaryBrush}"
+                            Text="{x:Bind ViewModel.TimelineSliderThumbLyricsLine.StartMs, Converter={StaticResource MillisecondsToFormattedTimeConverter}, Mode=OneWay}" />
+                        <TextBlock Margin="0,0,0,2" Text="{x:Bind ViewModel.TimelineSliderThumbLyricsLine.DisplayedText, Mode=OneWay}" />
+                    </StackPanel>
+                </Grid>
+                <Grid
+                    Height="32"
+                    Margin="0,-32,0,0"
+                    VerticalAlignment="Top"
+                    Background="Transparent"
+                    PointerEntered="TimelineSliderOverlay_PointerEntered"
+                    PointerExited="TimelineSliderOverlay_PointerExited"
+                    PointerMoved="TimelineSliderOverlay_PointerMoved"
+                    PointerPressed="TimelineSliderOverlay_PointerPressed" />
             </Grid>
 
         </Grid>
@@ -333,7 +364,7 @@
                 <Flyout x:Name="BottomCommandFlyout" ShouldConstrainToRootBounds="False">
                     <Flyout.FlyoutPresenterStyle>
                         <Style TargetType="FlyoutPresenter">
-                            <Setter Property="MinWidth" Value="450" />
+                            <Setter Property="MinWidth" Value="500" />
                             <Setter Property="MinHeight" Value="100" />
                             <Setter Property="CornerRadius" Value="12" />
                         </Style>

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

@@ -10,6 +10,7 @@ using CommunityToolkit.Mvvm.DependencyInjection;
 using Microsoft.UI.Xaml;
 using Microsoft.UI.Xaml.Controls;
 using System.Diagnostics;
+using System.Linq;
 using System.Numerics;
 using System.Runtime.CompilerServices;
 using System.Threading.Tasks;
@@ -60,7 +61,7 @@ namespace BetterLyrics.WinUI3.Views
 
         private void RootGrid_SizeChanged(object sender, SizeChangedEventArgs e)
         {
-            if (e.NewSize.Width < 450 || e.NewSize.Height < 100)
+            if (e.NewSize.Width < 500 || e.NewSize.Height < 100)
             {
                 if (BottomCommandGrid.Children.Count != 0)
                 {
@@ -110,11 +111,6 @@ namespace BetterLyrics.WinUI3.Views
             }
         }
 
-        private void TimelineSliderOverlay_Tapped(object sender, Microsoft.UI.Xaml.Input.TappedRoutedEventArgs e)
-        {
-            _mediaSessionsService.ChangePosition(TimelineSlider.Value);
-        }
-
         private void PlaybackSettingsFlyout_Closed(object sender, object e)
         {
             PlaybackSettingsFlyout.Content = null;
@@ -149,5 +145,41 @@ namespace BetterLyrics.WinUI3.Views
         {
             LyricsSearchFlyout.Content = null;
         }
+
+        private void TimelineSliderOverlay_PointerPressed(object sender, Microsoft.UI.Xaml.Input.PointerRoutedEventArgs e)
+        {
+            var grid = (Grid)sender;
+            var pos = e.GetCurrentPoint(grid).Position;
+            var ratio = pos.X / grid.ActualWidth;
+            _mediaSessionsService.ChangePosition(TimelineSlider.Maximum * ratio);
+        }
+
+        private void TimelineSliderOverlay_PointerMoved(object sender, Microsoft.UI.Xaml.Input.PointerRoutedEventArgs e)
+        {
+            float targetX;
+            var grid = (Grid)sender;
+            var pos = e.GetCurrentPoint(grid).Position;
+            var ratio = pos.X / grid.ActualWidth;
+            ViewModel.TimelineSliderThumbSeconds = TimelineSlider.Maximum * ratio;
+            if (pos.X + TimelineSliderLyricsLineInfo.ActualWidth > grid.ActualWidth)
+            {
+                targetX = (float)(grid.ActualWidth - TimelineSliderLyricsLineInfo.ActualWidth);
+            }
+            else
+            {
+                targetX = (float)pos.X;
+            }
+            TimelineSliderLyricsLineInfo.Translation = new Vector3(targetX, 0, 0);
+        }
+
+        private void TimelineSliderOverlay_PointerEntered(object sender, Microsoft.UI.Xaml.Input.PointerRoutedEventArgs e)
+        {
+            ViewModel.TimelineSliderThumbOpacity = 0.7f;
+        }
+
+        private void TimelineSliderOverlay_PointerExited(object sender, Microsoft.UI.Xaml.Input.PointerRoutedEventArgs e)
+        {
+            ViewModel.TimelineSliderThumbOpacity = 0f;
+        }
     }
 }

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

@@ -25,6 +25,7 @@
         <!--  Top command  -->
         <Grid
             x:Name="TopCommandGrid"
+            Margin="6"
             VerticalAlignment="Top"
             Background="Transparent"
             Opacity="{x:Bind ViewModel.TopCommandGridOpacity, Mode=OneWay}"

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Views/MusicGalleryPage.xaml

@@ -354,7 +354,7 @@
                                     <StackPanel>
                                         <TextBlock Text="{Binding Track.Title}" TextWrapping="Wrap" />
                                         <TextBlock
-                                            Foreground="{StaticResource TextFillColorSecondaryBrush}"
+                                            Foreground="{ThemeResource TextFillColorSecondaryBrush}"
                                             Text="{Binding Track.Artist}"
                                             TextWrapping="Wrap" />
                                     </StackPanel>