From 222c1d9aa10d558c3bdc1edc21d06998d5998d4e Mon Sep 17 00:00:00 2001
From: Zhe Fang <founchoo@outlook.com>
Date: Tue, 28 Oct 2025 15:28:45 -0400
Subject: [PATCH] chores: replace romaji convert package with a lightweight
 one; fix search control result lacking languages

---
 .../BetterLyrics.WinUI3/App.xaml              |   1 +
 .../BetterLyrics.WinUI3.csproj                |   3 +-
 .../Converter/ByteArrayToImageConverter.cs    |  44 ++++++++
 .../Helper/LanguageHelper.cs                  |  28 ++++-
 .../Helper/LyricsParser.cs                    |   8 +-
 .../Helper/SpectrumAnalyzer.cs                |   2 +-
 .../Helper/WindowHelper.cs                    |  12 +-
 .../LyricsSearchControlViewModel.cs           |   5 +-
 .../ViewModels/LyricsWindowViewModel.cs       |   2 +-
 .../BetterLyrics.WinUI3/Views/LyricsPage.xaml |   2 +-
 .../Views/LyricsWindow.xaml                   |   8 ++
 .../Views/LyricsWindow.xaml.cs                |   5 +
 .../Views/MusicGalleryPage.xaml               | 103 ++++++++++--------
 .../Views/MusicGalleryWindow.xaml             |  23 +++-
 .../Views/MusicGalleryWindow.xaml.cs          |  12 ++
 .../Views/SettingsWindow.xaml                 |  25 ++++-
 .../Views/SettingsWindow.xaml.cs              |  12 ++
 17 files changed, 223 insertions(+), 72 deletions(-)
 create mode 100644 BetterLyrics.WinUI3/BetterLyrics.WinUI3/Converter/ByteArrayToImageConverter.cs

diff --git a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/App.xaml b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/App.xaml
index 07c430b..e6fc9ba 100644
--- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/App.xaml
+++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/App.xaml
@@ -60,6 +60,7 @@
             <converter:BoolToOpacityConverter x:Key="BoolToOpacityConverter" />
             <converter:RectToMarginConverter x:Key="RectToMarginConverter" />
             <converter:LanguageCodeToDisplayedNameConverter x:Key="LanguageCodeToDisplayedNameConverter" />
+            <converter:ByteArrayToImageConverter x:Key="ByteArrayToImageConverter" />
 
             <converters:BoolToVisibilityConverter x:Key="BoolToVisibilityConverter" />
             <converters:BoolNegationConverter x:Key="BoolNegationConverter" />
diff --git a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/BetterLyrics.WinUI3.csproj b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/BetterLyrics.WinUI3.csproj
index 492f151..915f90b 100644
--- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/BetterLyrics.WinUI3.csproj
+++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/BetterLyrics.WinUI3.csproj
@@ -50,6 +50,7 @@
 	</ItemGroup>
 	<ItemGroup>
 		<PackageReference Include="3v.EvtSource" Version="2.0.0" />
+		<PackageReference Include="CommunityToolkit.Labs.WinUI.Controls.OpacityMaskView" Version="0.1.251021-build.2365" />
 		<PackageReference Include="CommunityToolkit.Labs.WinUI.MarqueeText" Version="0.1.230830" />
 		<PackageReference Include="CommunityToolkit.Labs.WinUI.OpacityMaskView" Version="0.1.250703-build.2173" />
 		<PackageReference Include="CommunityToolkit.Labs.WinUI.Shimmer" Version="0.1.250703-build.2173" />
@@ -64,6 +65,7 @@
 		<PackageReference Include="CommunityToolkit.WinUI.Extensions" Version="8.2.250402" />
 		<PackageReference Include="CommunityToolkit.WinUI.Helpers" Version="8.2.250402" />
 		<PackageReference Include="CommunityToolkit.WinUI.Media" Version="8.2.250402" />
+		<PackageReference Include="csharp-kana" Version="1.0.2" />
 		<PackageReference Include="csharp-pinyin" Version="1.0.1" />
 		<PackageReference Include="Dubya.WindowsMediaController" Version="2.5.5" />
 		<PackageReference Include="H.NotifyIcon.WinUI" Version="2.3.2" />
@@ -78,7 +80,6 @@
 		<PackageReference Include="Nito.AsyncEx" Version="5.1.2" />
 		<PackageReference Include="Nito.AsyncEx.Tasks" Version="5.1.2" />
 		<PackageReference Include="NTextCat" Version="0.3.65" />
-		<PackageReference Include="RomajiConverter.Core" Version="1.0.9" />
 		<PackageReference Include="Serilog.Extensions.Logging" Version="9.0.3-dev-02320" />
 		<PackageReference Include="Serilog.Sinks.File" Version="7.0.0" />
 		<PackageReference Include="ShadowViewer.Controls.Notification" Version="1.2.1" />
diff --git a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Converter/ByteArrayToImageConverter.cs b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Converter/ByteArrayToImageConverter.cs
new file mode 100644
index 0000000..f6c7084
--- /dev/null
+++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Converter/ByteArrayToImageConverter.cs
@@ -0,0 +1,44 @@
+using Microsoft.UI.Xaml.Data;
+using Microsoft.UI.Xaml.Media.Imaging;
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace BetterLyrics.WinUI3.Converter
+{
+    public partial class ByteArrayToImageConverter : IValueConverter
+    {
+        public object Convert(object value, Type targetType, object parameter, string language)
+        {
+            if (value is byte[] byteArray && byteArray.Length > 0)
+            {
+                try
+                {
+                    using (var ms = new MemoryStream(byteArray))
+                    {
+                        var stream = ms.AsRandomAccessStream();
+                        var bitmapImage = new BitmapImage();
+
+                        bitmapImage.SetSource(stream);
+
+                        return bitmapImage;
+                    }
+                }
+                catch
+                {
+                    return null;
+                }
+            }
+
+            return null;
+        }
+
+        public object ConvertBack(object value, Type targetType, object parameter, string language)
+        {
+            throw new NotImplementedException();
+        }
+    }
+}
diff --git a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Helper/LanguageHelper.cs b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Helper/LanguageHelper.cs
index 8955c90..ae9654a 100644
--- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Helper/LanguageHelper.cs
+++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Helper/LanguageHelper.cs
@@ -2,6 +2,7 @@
 using NTextCat;
 using System.Collections.Generic;
 using System.Linq;
+using System.Text;
 using Windows.Globalization;
 
 namespace BetterLyrics.WinUI3.Services
@@ -87,7 +88,6 @@ namespace BetterLyrics.WinUI3.Services
         static LanguageHelper()
         {
             _identifier = _factory.Load(PathHelper.LanguageProfilePath);
-            RomajiConverter.Core.Helpers.RomajiHelper.Init();
         }
 
         public static string? DetectLanguageCode(string? text)
@@ -135,9 +135,9 @@ namespace BetterLyrics.WinUI3.Services
             if (char.IsLetter(c) && c < 128)
                 return char.ToUpper(c).ToString();
 
-            if (Pinyin.Pinyin.Instance.IsHanzi(c.ToString()))
+            if (IsHanzi(c.ToString()))
             {
-                return Pinyin.Pinyin.Instance.HanziToPinyin(c.ToString(), Pinyin.ManTone.Style.NORMAL).ToStr().ToUpper().FirstOrDefault().ToString();
+                return ToPinyin(c.ToString(), Pinyin.ManTone.Style.NORMAL).ToUpper().FirstOrDefault().ToString();
             }
 
             return "#";
@@ -145,7 +145,27 @@ namespace BetterLyrics.WinUI3.Services
 
         public static string ToRomaji(string text)
         {
-            return string.Join(" ", RomajiConverter.Core.Helpers.RomajiHelper.SentenceToRomaji(text).Select(x => x.Romaji));
+            return Kana.Kana.KanaToRomaji(text).ToStr();
+        }
+
+        public static string ToPinyin(string text, Pinyin.ManTone.Style style = Pinyin.ManTone.Style.TONE)
+        {
+            return Pinyin.Pinyin.Instance.HanziToPinyin(text, style).ToStr();
+        }
+
+        public static string ToJyutping(string text)
+        {
+            return Pinyin.Jyutping.Instance.HanziToPinyin(text).ToStr();
+        }
+
+        public static bool IsHanzi(char ch)
+        {
+            return IsHanzi(ch.ToString());
+        }
+
+        public static bool IsHanzi(string text)
+        {
+            return Pinyin.Pinyin.Instance.IsHanzi(text);
         }
     }
 }
diff --git a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Helper/LyricsParser.cs b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Helper/LyricsParser.cs
index a54a939..87da7f7 100644
--- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Helper/LyricsParser.cs
+++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Helper/LyricsParser.cs
@@ -111,12 +111,12 @@ namespace BetterLyrics.WinUI3.Helper
                     {
                         StartMs = line.StartMs,
                         EndMs = line.EndMs,
-                        OriginalText = Pinyin.Pinyin.Instance.HanziToPinyin(line.OriginalText).ToStr(),
+                        OriginalText = LanguageHelper.ToPinyin(line.OriginalText),
                         LyricsChars = line.LyricsChars.Select(c => new LyricsChar
                         {
                             StartMs = c.StartMs,
                             EndMs = c.EndMs,
-                            Text = Pinyin.Pinyin.Instance.HanziToPinyin(c.Text).ToStr(),
+                            Text = LanguageHelper.ToPinyin(c.Text),
                             StartIndex = c.StartIndex
                         }).ToList()
                     }).ToList()
@@ -128,12 +128,12 @@ namespace BetterLyrics.WinUI3.Helper
                     {
                         StartMs = line.StartMs,
                         EndMs = line.EndMs,
-                        OriginalText = Pinyin.Jyutping.Instance.HanziToPinyin(line.OriginalText).ToStr(),
+                        OriginalText = LanguageHelper.ToJyutping(line.OriginalText),
                         LyricsChars = line.LyricsChars.Select(c => new LyricsChar
                         {
                             StartMs = c.StartMs,
                             EndMs = c.EndMs,
-                            Text = Pinyin.Jyutping.Instance.HanziToPinyin(c.Text).ToStr(),
+                            Text = LanguageHelper.ToJyutping(c.Text),
                             StartIndex = c.StartIndex
                         }).ToList()
                     }).ToList()
diff --git a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Helper/SpectrumAnalyzer.cs b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Helper/SpectrumAnalyzer.cs
index 03067d0..f8cfebc 100644
--- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Helper/SpectrumAnalyzer.cs
+++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Helper/SpectrumAnalyzer.cs
@@ -31,7 +31,7 @@ namespace BetterLyrics.WinUI3.Helper
         public float[] SmoothSpectrum { get; private set; }
         
         public int BarCount { get; set; } = 32;
-        public int Sensitivity { get; set; } = 5;
+        public int Sensitivity { get; set; } = 10;
         public float SmoothingFactor { get; set; } = 0.95f;
         public bool IsCapturing { get; private set; } = false;
 
diff --git a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Helper/WindowHelper.cs b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Helper/WindowHelper.cs
index a0b9dc9..9e01725 100644
--- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Helper/WindowHelper.cs
+++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Helper/WindowHelper.cs
@@ -114,16 +114,8 @@ namespace BetterLyrics.WinUI3.Helper
             else
             {
                 var castedWindow = (Window)window;
-                if (typeof(T) == typeof(LyricsWindow))
-                {
-                    var lyricsWindow = (LyricsWindow)window;
-                    lyricsWindow.Show();
-                }
-                else
-                {
-                    castedWindow.Restore();
-                    castedWindow.Activate();
-                }
+                castedWindow.Activate();
+                castedWindow.AppWindow.MoveInZOrderAtTop();
             }
         }
 
diff --git a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/ViewModels/LyricsSearchControlViewModel.cs b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/ViewModels/LyricsSearchControlViewModel.cs
index 0703f9e..abdc714 100644
--- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/ViewModels/LyricsSearchControlViewModel.cs
+++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/ViewModels/LyricsSearchControlViewModel.cs
@@ -172,7 +172,10 @@ namespace BetterLyrics.WinUI3.ViewModels
             if (value?.Raw != null)
             {
                 var lyricsParser = new LyricsParser();
-                lyricsParser.Parse(value?.Title ?? "", value?.Artist ?? "", value?.Raw, (int?)_mediaSessionsService.SongInfo?.DurationMs, value?.Provider);
+                lyricsParser.Parse(
+                    MappedSongSearchQuery?.MappedTitle ?? "", 
+                    MappedSongSearchQuery?.MappedArtist ?? "", 
+                    value?.Raw, (int?)_mediaSessionsService.SongInfo?.DurationMs, value?.Provider);
                 LyricsDataArr = [.. lyricsParser.LyricsDataArr];
             }
             else
diff --git a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/ViewModels/LyricsWindowViewModel.cs b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/ViewModels/LyricsWindowViewModel.cs
index c4f289d..6ac47a5 100644
--- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/ViewModels/LyricsWindowViewModel.cs
+++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/ViewModels/LyricsWindowViewModel.cs
@@ -70,7 +70,7 @@ namespace BetterLyrics.WinUI3
 
         [ObservableProperty] public partial ElementTheme ThemeType { get; set; } = ElementTheme.Default;
 
-        [ObservableProperty] public partial double TitleBarFontSize { get; set; } = 11;
+        [ObservableProperty] public partial double TitleBarFontSize { get; set; } = 12;
 
         [ObservableProperty] public partial Visibility CloseButtonVisibility { get; set; } = Visibility.Visible;
 
diff --git a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Views/LyricsPage.xaml b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Views/LyricsPage.xaml
index d983bb2..09beeae 100644
--- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Views/LyricsPage.xaml
+++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Views/LyricsPage.xaml
@@ -267,7 +267,7 @@
                             x:Name="SettingsButton"
                             Command="{x:Bind ViewModel.OpenSettingsWindowCommand}"
                             Content="{ui:FontIcon FontFamily={StaticResource IconFontFamily},
-                                                  Glyph=&#xF8B0;}"
+                                                  Glyph=&#xE713;}"
                             Style="{StaticResource GhostButtonStyle}">
                             <ToolTipService.ToolTip>
                                 <ToolTip x:Name="SettingsToolTip" x:Uid="LyricsPageSettingsButtonToolTip" />
diff --git a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Views/LyricsWindow.xaml b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Views/LyricsWindow.xaml
index 8a1e9eb..6b04279 100644
--- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Views/LyricsWindow.xaml
+++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Views/LyricsWindow.xaml
@@ -57,6 +57,14 @@
                         </ToolTipService.ToolTip>
                     </Button>
 
+                    <Button
+                        x:Name="SettingsWindowButton"
+                        Click="SettingsWindowButton_Click"
+                        Content="{ui:FontIcon FontFamily={StaticResource IconFontFamily},
+                                              FontSize=12,
+                                              Glyph=&#xE713;}"
+                        Style="{StaticResource TitleBarButtonStyle}" />
+
                     <Button Click="LyricsWindowSwitchButton_Click" Style="{StaticResource TitleBarButtonStyle}">
                         <FontIcon
                             FontFamily="{StaticResource IconFontFamily}"
diff --git a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Views/LyricsWindow.xaml.cs b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Views/LyricsWindow.xaml.cs
index 01d705c..045c1e3 100644
--- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Views/LyricsWindow.xaml.cs
+++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Views/LyricsWindow.xaml.cs
@@ -132,5 +132,10 @@ namespace BetterLyrics.WinUI3.Views
         {
             WindowHelper.OpenOrShowWindow<LyricsWindowSwitchWindow>();
         }
+
+        private void SettingsWindowButton_Click(object sender, RoutedEventArgs e)
+        {
+            WindowHelper.OpenOrShowWindow<SettingsWindow>();
+        }
     }
 }
diff --git a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Views/MusicGalleryPage.xaml b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Views/MusicGalleryPage.xaml
index cf569c5..7dc94dd 100644
--- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Views/MusicGalleryPage.xaml
+++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Views/MusicGalleryPage.xaml
@@ -12,6 +12,7 @@
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     xmlns:media="using:CommunityToolkit.WinUI.Media"
     xmlns:models="using:BetterLyrics.WinUI3.Models"
+    xmlns:muxm="using:Microsoft.UI.Xaml.Media"
     xmlns:templateselector="using:BetterLyrics.WinUI3.TemplateSelector"
     xmlns:ui="using:CommunityToolkit.WinUI"
     Unloaded="Page_Unloaded"
@@ -205,56 +206,68 @@
                             SelectionMode="Multiple">
                             <ListView.ItemTemplate>
                                 <DataTemplate x:DataType="atl:Track">
-                                    <Grid Padding="12" RightTapped="SongListViewItemGrid_RightTapped">
-                                        <Grid.ColumnDefinitions>
-                                            <ColumnDefinition Width="2*" />
-                                            <ColumnDefinition Width="1.5*" />
-                                            <ColumnDefinition Width="1.5*" />
-                                            <ColumnDefinition Width="1*" />
-                                            <ColumnDefinition Width="1*" />
-                                        </Grid.ColumnDefinitions>
+                                    <Grid RightTapped="SongListViewItemGrid_RightTapped">
 
-                                        <!--  歌曲名  -->
-                                        <TextBlock
-                                            Grid.Column="0"
-                                            VerticalAlignment="Center"
-                                            Text="{Binding Title}"
-                                            TextWrapping="Wrap" />
+                                        <Grid
+                                            x:Name="SongListViewItemContentGrid"
+                                            Padding="12"
+                                            ColumnSpacing="12">
 
-                                        <!--  歌手名  -->
-                                        <HyperlinkButton
-                                            Grid.Column="1"
-                                            VerticalAlignment="Center"
-                                            Click="ArtistHyperlibkButton_Click"
-                                            Tag="{Binding Artist}">
-                                            <TextBlock Text="{Binding Artist}" TextWrapping="Wrap" />
-                                        </HyperlinkButton>
+                                            <Grid.ColumnDefinitions>
+                                                <ColumnDefinition Width="0.5*" />
+                                                <ColumnDefinition Width="2*" />
+                                                <ColumnDefinition Width="1.5*" />
+                                                <ColumnDefinition Width="1.5*" />
+                                                <ColumnDefinition Width="1*" />
+                                                <ColumnDefinition Width="1*" />
+                                            </Grid.ColumnDefinitions>
 
-                                        <!--  专辑名  -->
-                                        <HyperlinkButton
-                                            Grid.Column="2"
-                                            VerticalAlignment="Center"
-                                            Click="AlbumHyperlibkButton_Click"
-                                            Tag="{Binding Album}">
-                                            <TextBlock Text="{Binding Album}" TextWrapping="Wrap" />
-                                        </HyperlinkButton>
+                                            <Grid Grid.Column="0" CornerRadius="6">
+                                                <Image Source="{Binding EmbeddedPictures[0].PictureData, Mode=OneWay, Converter={StaticResource ByteArrayToImageConverter}}" Stretch="UniformToFill" />
+                                            </Grid>
 
-                                        <!--  年份  -->
-                                        <TextBlock
-                                            Grid.Column="3"
-                                            VerticalAlignment="Center"
-                                            Foreground="{ThemeResource TextFillColorSecondaryBrush}"
-                                            Text="{Binding Year}"
-                                            TextWrapping="Wrap" />
+                                            <!--  歌曲名  -->
+                                            <TextBlock
+                                                Grid.Column="1"
+                                                VerticalAlignment="Center"
+                                                Text="{Binding Title}"
+                                                TextWrapping="Wrap" />
 
-                                        <!--  歌曲时长  -->
-                                        <TextBlock
-                                            Grid.Column="4"
-                                            VerticalAlignment="Center"
-                                            Foreground="{ThemeResource TextFillColorSecondaryBrush}"
-                                            Text="{Binding Duration, Converter={StaticResource SecondsToFormattedTimeConverter}}"
-                                            TextAlignment="Right"
-                                            TextWrapping="Wrap" />
+                                            <!--  歌手名  -->
+                                            <HyperlinkButton
+                                                Grid.Column="2"
+                                                VerticalAlignment="Center"
+                                                Click="ArtistHyperlibkButton_Click"
+                                                Tag="{Binding Artist}">
+                                                <TextBlock Text="{Binding Artist}" TextWrapping="Wrap" />
+                                            </HyperlinkButton>
+
+                                            <!--  专辑名  -->
+                                            <HyperlinkButton
+                                                Grid.Column="3"
+                                                VerticalAlignment="Center"
+                                                Click="AlbumHyperlibkButton_Click"
+                                                Tag="{Binding Album}">
+                                                <TextBlock Text="{Binding Album}" TextWrapping="Wrap" />
+                                            </HyperlinkButton>
+
+                                            <!--  年份  -->
+                                            <TextBlock
+                                                Grid.Column="4"
+                                                VerticalAlignment="Center"
+                                                Foreground="{ThemeResource TextFillColorSecondaryBrush}"
+                                                Text="{Binding Year}"
+                                                TextWrapping="Wrap" />
+
+                                            <!--  歌曲时长  -->
+                                            <TextBlock
+                                                Grid.Column="5"
+                                                VerticalAlignment="Center"
+                                                Foreground="{ThemeResource TextFillColorSecondaryBrush}"
+                                                Text="{Binding Duration, Converter={StaticResource SecondsToFormattedTimeConverter}}"
+                                                TextAlignment="Right"
+                                                TextWrapping="Wrap" />
+                                        </Grid>
                                     </Grid>
                                 </DataTemplate>
                             </ListView.ItemTemplate>
diff --git a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Views/MusicGalleryWindow.xaml b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Views/MusicGalleryWindow.xaml
index 7d2648c..afe7f5d 100644
--- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Views/MusicGalleryWindow.xaml
+++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Views/MusicGalleryWindow.xaml
@@ -6,7 +6,7 @@
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:local="using:BetterLyrics.WinUI3.Views"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-    Title="MusicGalleryWindow"
+    xmlns:ui="using:CommunityToolkit.WinUI"
     mc:Ignorable="d">
 
     <Window.SystemBackdrop>
@@ -14,7 +14,26 @@
     </Window.SystemBackdrop>
 
     <Grid>
-        <local:MusicGalleryPage />
+
+        <local:MusicGalleryPage Margin="0,40,0,0" />
+
+        <StackPanel VerticalAlignment="Top" Orientation="Horizontal">
+            <Button
+                x:Name="LyricsWindowButton"
+                Click="LyricsWindowButton_Click"
+                Content="{ui:FontIcon FontFamily={StaticResource IconFontFamily},
+                                      FontSize=12,
+                                      Glyph=&#xE90B;}"
+                Style="{StaticResource TitleBarButtonStyle}" />
+            <Button
+                x:Name="SettingsWindowButton"
+                Click="SettingsWindowButton_Click"
+                Content="{ui:FontIcon FontFamily={StaticResource IconFontFamily},
+                                      FontSize=12,
+                                      Glyph=&#xE713;}"
+                Style="{StaticResource TitleBarButtonStyle}" />
+        </StackPanel>
+
     </Grid>
 
 </Window>
diff --git a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Views/MusicGalleryWindow.xaml.cs b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Views/MusicGalleryWindow.xaml.cs
index e2e41ca..337dbc4 100644
--- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Views/MusicGalleryWindow.xaml.cs
+++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Views/MusicGalleryWindow.xaml.cs
@@ -34,6 +34,8 @@ namespace BetterLyrics.WinUI3.Views
             AppWindow.TitleBar.PreferredTheme = TitleBarTheme.UseDefaultAppMode;
             AppWindow.SetIcons();
 
+            ExtendsContentIntoTitleBar = true;
+
             AppWindow.Closing += AppWindow_Closing;
         }
 
@@ -41,5 +43,15 @@ namespace BetterLyrics.WinUI3.Views
         {
             WindowHelper.CloseWindow<MusicGalleryWindow>();
         }
+
+        private void LyricsWindowButton_Click(object sender, RoutedEventArgs e)
+        {
+            WindowHelper.OpenOrShowWindow<LyricsWindow>();
+        }
+
+        private void SettingsWindowButton_Click(object sender, RoutedEventArgs e)
+        {
+            WindowHelper.OpenOrShowWindow<SettingsWindow>();
+        }
     }
 }
diff --git a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Views/SettingsWindow.xaml b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Views/SettingsWindow.xaml
index c1268fc..9c5c884 100644
--- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Views/SettingsWindow.xaml
+++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Views/SettingsWindow.xaml
@@ -7,14 +7,35 @@
     xmlns:local="using:BetterLyrics.WinUI3.Views"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     xmlns:scontrols="using:ShadowViewer.Controls"
+    xmlns:ui="using:CommunityToolkit.WinUI"
     mc:Ignorable="d">
 
     <Window.SystemBackdrop>
-        <MicaBackdrop />
+        <DesktopAcrylicBackdrop />
     </Window.SystemBackdrop>
 
     <Grid x:Name="RootGrid">
-        <Frame x:Name="RootFrame" />
+        <Frame x:Name="RootFrame" Margin="0,40,0,0" />
+
+        <StackPanel VerticalAlignment="Top" Orientation="Horizontal">
+            <Button
+                x:Name="LyricsWindowButton"
+                Click="LyricsWindowButton_Click"
+                Content="{ui:FontIcon FontFamily={StaticResource IconFontFamily},
+                                      FontSize=12,
+                                      Glyph=&#xE90B;}"
+                Style="{StaticResource TitleBarButtonStyle}" />
+            <Button
+                Click="MusicGalleryButton_Click"
+                Content="{ui:FontIcon FontFamily={StaticResource IconFontFamily},
+                                      FontSize=12,
+                                      Glyph=&#xE8F1;}"
+                Style="{StaticResource TitleBarButtonStyle}">
+                <ToolTipService.ToolTip>
+                    <ToolTip x:Uid="HostWindowMusicGalleryButtonToolTip" />
+                </ToolTipService.ToolTip>
+            </Button>
+        </StackPanel>
 
         <scontrols:NotificationPanel
             x:Name="TipContainerCenter"
diff --git a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Views/SettingsWindow.xaml.cs b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Views/SettingsWindow.xaml.cs
index 46dca8c..a7b8316 100644
--- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Views/SettingsWindow.xaml.cs
+++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Views/SettingsWindow.xaml.cs
@@ -18,6 +18,8 @@ namespace BetterLyrics.WinUI3.Views
             AppWindow.TitleBar.PreferredTheme = TitleBarTheme.UseDefaultAppMode;
             AppWindow.SetIcons();
 
+            ExtendsContentIntoTitleBar = true;
+
             AppWindow.Closing += AppWindow_Closing;
 
             RootFrame.Navigate(typeof(SettingsPage));
@@ -32,5 +34,15 @@ namespace BetterLyrics.WinUI3.Views
         {
             App.Current.SettingsWindowNotificationPanel = TipContainerCenter;
         }
+
+        private void LyricsWindowButton_Click(object sender, RoutedEventArgs e)
+        {
+            WindowHelper.OpenOrShowWindow<LyricsWindow>();
+        }
+
+        private void MusicGalleryButton_Click(object sender, RoutedEventArgs e)
+        {
+            WindowHelper.OpenOrShowWindow<MusicGalleryWindow>();
+        }
     }
 }