更新 FAQ.md

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

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

@@ -32,6 +32,7 @@
 		<None Remove="Controls\PlaybackSettingsControl.xaml" />
 		<None Remove="Controls\ShortcutTextBox.xaml" />
 		<None Remove="Controls\SystemTray.xaml" />
+		<None Remove="Views\LyricsSearchWindow.xaml" />
 		<None Remove="Views\MusicGalleryPage.xaml" />
 		<None Remove="Views\MusicGalleryWindow.xaml" />
 		<None Remove="Views\SettingsWindow.xaml" />
@@ -181,6 +182,11 @@
 	    <CopyToOutputDirectory>Always</CopyToOutputDirectory>
 	  </Content>
 	</ItemGroup>
+	<ItemGroup>
+	  <Page Update="Views\LyricsSearchWindow.xaml">
+	    <Generator>MSBuild:Compile</Generator>
+	  </Page>
+	</ItemGroup>
 	<ItemGroup>
 	  <Page Update="Controls\LyricsSearchControl.xaml">
 	    <Generator>MSBuild:Compile</Generator>

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

@@ -13,61 +13,61 @@
 
     <Grid Padding="16" RowSpacing="6">
         <Grid.RowDefinitions>
-            <RowDefinition Height="Auto" />
             <RowDefinition Height="*" />
             <RowDefinition Height="Auto" />
         </Grid.RowDefinitions>
-        <Grid Grid.Row="0" Margin="0,0,0,6">
-            <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="1">
+        <Grid Grid.Row="0">
             <Grid.ColumnDefinitions>
                 <ColumnDefinition Width="*" />
-                <ColumnDefinition Width="2*" />
+                <ColumnDefinition Width="*" />
+                <ColumnDefinition Width="*" />
             </Grid.ColumnDefinitions>
-            <Grid Grid.Column="0" RowSpacing="12">
+            <Grid Grid.Column="0">
+                <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.Column="1">
                 <ListView ItemsSource="{x:Bind ViewModel.LyricsSearchResults, Mode=OneWay}" SelectedItem="{x:Bind ViewModel.SelectedLyricsSearchResult, Mode=TwoWay}">
                     <ListView.ItemTemplate>
                         <DataTemplate>
@@ -144,7 +144,7 @@
                     ShowPaused="False"
                     Visibility="{x:Bind ViewModel.IsSearching, Converter={StaticResource BoolToVisibilityConverter}, Mode=OneWay}" />
             </Grid>
-            <Grid Grid.Column="1">
+            <Grid Grid.Column="2">
                 <ListView ItemsSource="{x:Bind ViewModel.LyricsData.LyricsLines, Mode=OneWay}" SelectedItem="{x:Bind ViewModel.SelectedLyricsLine, Mode=TwoWay}">
                     <interactivity:Interaction.Behaviors>
                         <interactivity:DataTriggerBehavior
@@ -197,7 +197,7 @@
                 </StackPanel>
             </Grid>
         </Grid>
-        <Grid Grid.Row="2">
+        <Grid Grid.Row="1">
             <RelativePanel>
                 <TextBlock
                     x:Uid="LyricsSearchControlHelp"

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

@@ -94,6 +94,11 @@ namespace BetterLyrics.WinUI3.Helper
             return Color.FromArgb(alpha, color.R, color.G, color.B);
         }
 
+        public static Color WithOpacity(this Color color, float opacity)
+        {
+            return Color.FromArgb((byte)(opacity * 255), color.R, color.G, color.B);
+        }
+
         public static Color WithBrightness(this Color color, double brightness)
         {
             // 确保亮度因子在合理范围内

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Helper/LyricsParser.cs

@@ -246,10 +246,11 @@ namespace BetterLyrics.WinUI3.Helper
                     int pStartMs = ParseTtmlTime(pBegin);
                     int pEndMs = ParseTtmlTime(pEnd);
 
-                    // 只获取一级span，且排除ttm:role="x-bg"的span
+                    // 只获取一级span，且排除 ttm:role="x-bg" 的 span 和 ttm:role="x-roman"
                     var spans = p.Elements()
                         .Where(s => s.Name.LocalName == "span" &&
-                                    s.Attribute(XName.Get("role", "http://www.w3.org/ns/ttml#metadata"))?.Value != "x-bg")
+                                    s.Attribute(XName.Get("role", "http://www.w3.org/ns/ttml#metadata"))?.Value != "x-bg" &&
+                                    s.Attribute(XName.Get("role", "http://www.w3.org/ns/ttml#metadata"))?.Value != "x-roman")
                         .ToList();
 
                     // 原文和翻译分离

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

@@ -59,6 +59,10 @@ namespace BetterLyrics.WinUI3.Helper
                 {
                     window = new MusicGalleryWindow();
                 }
+                else if (typeof(T) == typeof(LyricsSearchWindow))
+                {
+                    window = new LyricsSearchWindow();
+                }
                 else
                 {
                     throw new ArgumentException("Unsupported window type", nameof(T));

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

@@ -60,16 +60,16 @@ namespace BetterLyrics.WinUI3.Models
             var mointor = MonitorHelper.GetMonitorInfoExFromWindow(lyricsWindow);
             LyricsWindowMonitorName = mointor.szDevice;
             LyricsWindowMonitorBounds = new Rect(
-                mointor.rcWork.Left,
-                mointor.rcWork.Top,
-                mointor.rcWork.Width,
-                mointor.rcWork.Height
+                mointor.rcMonitor.Left,
+                mointor.rcMonitor.Top,
+                mointor.rcMonitor.Width,
+                mointor.rcMonitor.Height
             );
             DemoLyricsWindowMonitorBounds = new Rect(
-                mointor.rcWork.Left * factor,
-                mointor.rcWork.Top * factor,
-                mointor.rcWork.Width * factor,
-                mointor.rcWork.Height * factor
+                mointor.rcMonitor.Left * factor,
+                mointor.rcMonitor.Top * factor,
+                mointor.rcMonitor.Width * factor,
+                mointor.rcMonitor.Height * factor
             );
         }
     }

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

@@ -285,6 +285,9 @@
   <data name="LyricsSearchControlTitle.Header" xml:space="preserve">
     <value>Title</value>
   </data>
+  <data name="LyricsSearchPageTitle" xml:space="preserve">
+    <value>Lyrics search - BetterLyrics</value>
+  </data>
   <data name="LyricsSearchProviderEslrcFile" xml:space="preserve">
     <value>Local .ESLRC files</value>
   </data>

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

@@ -285,6 +285,9 @@
   <data name="LyricsSearchControlTitle.Header" xml:space="preserve">
     <value>タイトル</value>
   </data>
+  <data name="LyricsSearchPageTitle" xml:space="preserve">
+    <value>歌詞検索 - BetterLyrics</value>
+  </data>
   <data name="LyricsSearchProviderEslrcFile" xml:space="preserve">
     <value>ローカル.ESLRCファイル</value>
   </data>

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

@@ -285,6 +285,9 @@
   <data name="LyricsSearchControlTitle.Header" xml:space="preserve">
     <value>제목</value>
   </data>
+  <data name="LyricsSearchPageTitle" xml:space="preserve">
+    <value>가사 검색 - BetterLyrics</value>
+  </data>
   <data name="LyricsSearchProviderEslrcFile" xml:space="preserve">
     <value>로컬 .ESLRC 파일</value>
   </data>

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

@@ -285,6 +285,9 @@
   <data name="LyricsSearchControlTitle.Header" xml:space="preserve">
     <value>标题</value>
   </data>
+  <data name="LyricsSearchPageTitle" xml:space="preserve">
+    <value>歌词搜索 - BetterLyrics</value>
+  </data>
   <data name="LyricsSearchProviderEslrcFile" xml:space="preserve">
     <value>本地 .ESLRC 文件</value>
   </data>

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

@@ -285,6 +285,9 @@
   <data name="LyricsSearchControlTitle.Header" xml:space="preserve">
     <value>標題</value>
   </data>
+  <data name="LyricsSearchPageTitle" xml:space="preserve">
+    <value>歌詞搜尋 - BetterLyrics</value>
+  </data>
   <data name="LyricsSearchProviderEslrcFile" xml:space="preserve">
     <value>本地 .ESLRC 文件</value>
   </data>

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

@@ -245,14 +245,6 @@
                             <ToolTipService.ToolTip>
                                 <ToolTip x:Uid="LyricsPageLyricsSearchButtonToolTip" />
                             </ToolTipService.ToolTip>
-                            <Button.ContextFlyout>
-                                <Flyout
-                                    x:Name="LyricsSearchFlyout"
-                                    Closed="LyricsSearchFlyout_Closed"
-                                    FlyoutPresenterStyle="{StaticResource FlyoutPageStyle}"
-                                    Placement="Right"
-                                    ShouldConstrainToRootBounds="False" />
-                            </Button.ContextFlyout>
                         </Button>
 
                         <!--  Playback shortcut settings  -->

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

@@ -2,6 +2,7 @@
 
 using BetterLyrics.WinUI3.Controls;
 using BetterLyrics.WinUI3.Enums;
+using BetterLyrics.WinUI3.Helper;
 using BetterLyrics.WinUI3.Models.Settings;
 using BetterLyrics.WinUI3.Services.MediaSessionsService;
 using BetterLyrics.WinUI3.Services.SettingsService;
@@ -133,17 +134,7 @@ namespace BetterLyrics.WinUI3.Views
 
         private void LyricsSearchShortcutButton_Click(object sender, RoutedEventArgs e)
         {
-            LyricsSearchFlyout.Content = new LyricsSearchControl
-            {
-                MaxHeight = 500,
-                MaxWidth = 850,
-            };
-            LyricsSearchFlyout.ShowAt(BottomRightCommandStackPanel);
-        }
-
-        private void LyricsSearchFlyout_Closed(object sender, object e)
-        {
-            LyricsSearchFlyout.Content = null;
+            WindowHelper.OpenWindow<LyricsSearchWindow>();
         }
 
         private void TimelineSliderOverlay_PointerPressed(object sender, Microsoft.UI.Xaml.Input.PointerRoutedEventArgs e)

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Views/LyricsSearchWindow.xaml

@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<Window
+    x:Class="BetterLyrics.WinUI3.Views.LyricsSearchWindow"
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:controls="using:BetterLyrics.WinUI3.Controls"
+    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:media="using:CommunityToolkit.WinUI.Media"
+    mc:Ignorable="d">
+
+    <Grid Background="{ThemeResource SystemControlAcrylicWindowBrush}" Opacity="0.85">
+        <controls:LyricsSearchControl />
+    </Grid>
+</Window>

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Views/LyricsSearchWindow.xaml.cs

@@ -0,0 +1,47 @@
+using BetterLyrics.WinUI3.Helper;
+using Microsoft.UI.Windowing;
+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;
+
+// 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 LyricsSearchWindow : Window
+    {
+        public LyricsSearchWindow()
+        {
+            InitializeComponent();
+
+            Title = App.ResourceLoader?.GetString("LyricsSearchPageTitle");
+            AppWindow.TitleBar.PreferredTheme = TitleBarTheme.UseDefaultAppMode;
+            AppWindow.SetIcons();
+
+            AppWindow.Closing += AppWindow_Closing;
+
+            SystemBackdrop = SystemBackdropHelper.CreateSystemBackdrop(Enums.BackdropType.Transparent);
+        }
+
+        private void AppWindow_Closing(AppWindow sender, AppWindowClosingEventArgs args)
+        {
+            WindowHelper.CloseWindow<LyricsSearchWindow>();
+        }
+
+    }
+}

FAQ/FAQ.md

@@ -1,7 +1,7 @@
 ### Where I can find the logs?
 `C:\Users\%USERNAME%\AppData\Local\Packages\37412.BetterLyrics_rd1g0rsrrtxw8\LocalCache\logs`
 
-### How to install ".msixbundle" package?
+### 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?

How2Install/How2Install.md

@@ -1,4 +1,4 @@
-# How to install ".msixbundle" package
+# How to install ".msixbundle" test package
 
 ## Pre-steps
 

README.md

@@ -161,17 +161,17 @@ Watch our introduction video (uploaded on 18 Aug 2025) on Bilibili [here](https:
 	<img src="https://get.microsoft.com/images/en-us%20dark.svg" width="200"/>
 </a>
 
-**Easiest** way to get it. **Unlimited** free trail or purchase (there is **no difference** between free and paid version)
+**Unlimited** free trail or purchase (there is **no difference** between free and paid version)
 
 ☕ If you find it useful, please consider [donating](#donations) or purchasing 🧧 it in **Microsoft Store**, I'll appreciate it! 🥰
 
-> When there's a stable version built, Microsoft Store will be the first channel to get updated.
+### Unable to download from the Microsoft Store?
 
-### Google Drive
-
-Or get it from Google Drive (see [release](https://github.com/jayfunc/BetterLyrics/releases) page for the link)
-
-> Please note you are downloading ".zip" file, for guide on how to install it, please kindly follow [this doc](How2Install/How2Install.md).
+1. Visit https://store.rg-adguard.net/
+2. Type https://apps.microsoft.com/detail/9p1wcd1p597r in the link input area
+3. Select Retail from the drop-down list
+4. Click the check mark
+5. Select the largest installation package in the resulting list to download and install
 
 ## 💖 Many thanks to