From 212c1fbcddd63fef6f7ff519d041ba5df4383fe3 Mon Sep 17 00:00:00 2001
From: Zhe Fang <founchoo@outlook.com>
Date: Fri, 24 Oct 2025 15:43:36 -0400
Subject: [PATCH] chores: add lyrics window switcher entry for top command area
 ands system tray, add animation when open and close switcher

---
 .../BetterLyrics.WinUI3/App.xaml.cs             |  1 +
 .../Controls/LyricsWindowSwitchControl.xaml     |  8 +++++++-
 .../Controls/LyricsWindowSwitchControl.xaml.cs  | 15 ++++++++++++---
 .../Controls/SystemTray.xaml                    |  7 +++++--
 .../BetterLyrics.WinUI3/Helper/WindowHelper.cs  |  7 +++----
 .../Strings/en-US/Resources.resw                | 15 +++++++++------
 .../Strings/ja-JP/Resources.resw                |  9 ++++++---
 .../Strings/ko-KR/Resources.resw                |  9 ++++++---
 .../Strings/zh-CN/Resources.resw                |  9 ++++++---
 .../Strings/zh-TW/Resources.resw                |  9 ++++++---
 .../LyricsWindowSwitchWindowViewModel.cs        | 14 ++++++++++++++
 .../ViewModels/SystemTrayViewModel.cs           |  6 ++++++
 .../BetterLyrics.WinUI3/Views/LyricsPage.xaml   |  2 +-
 .../Views/LyricsPage.xaml.cs                    |  8 ++++++++
 .../BetterLyrics.WinUI3/Views/LyricsWindow.xaml | 12 +++++++++++-
 .../Views/LyricsWindow.xaml.cs                  |  9 +++++++--
 .../Views/LyricsWindowSwitchWindow.xaml         |  5 ++++-
 .../Views/LyricsWindowSwitchWindow.xaml.cs      | 17 +++++++++++++++++
 18 files changed, 129 insertions(+), 33 deletions(-)
 create mode 100644 BetterLyrics.WinUI3/BetterLyrics.WinUI3/ViewModels/LyricsWindowSwitchWindowViewModel.cs

diff --git a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/App.xaml.cs b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/App.xaml.cs
index 4dbc09e..1b4d7fb 100644
--- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/App.xaml.cs
+++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/App.xaml.cs
@@ -118,6 +118,7 @@ namespace BetterLyrics.WinUI3
                     .AddSingleton<LyricsSearchControlViewModel>()
                     .AddSingleton<LyricsWindowSettingsControlViewModel>()
                     .AddSingleton<LyricsWindowSwitchControlViewModel>()
+                    .AddSingleton<LyricsWindowSwitchWindowViewModel>()
                     .AddSingleton<LyricsWindowViewModel>()
                     .AddSingleton<SettingsWindowViewModel>()
                     .AddSingleton<SystemTrayViewModel>()
diff --git a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Controls/LyricsWindowSwitchControl.xaml b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Controls/LyricsWindowSwitchControl.xaml
index 0a76850..94b8659 100644
--- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Controls/LyricsWindowSwitchControl.xaml
+++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Controls/LyricsWindowSwitchControl.xaml
@@ -16,13 +16,19 @@
         VerticalAlignment="Center"
         Background="{ThemeResource AcrylicInAppFillColorDefaultBrush}"
         CornerRadius="12">
+        <FontIcon
+            Margin="20"
+            HorizontalAlignment="Left"
+            VerticalAlignment="Top"
+            FontFamily="{StaticResource IconFontFamily}"
+            Glyph="&#xE8AB;" />
         <Button
             Margin="12"
             HorizontalAlignment="Right"
             VerticalAlignment="Top"
             Click="Button_Click"
             Content="{ui:FontIcon FontFamily={StaticResource IconFontFamily},
-                                  Glyph=&#xE653;}"
+                                  Glyph=&#xE73C;}"
             Style="{StaticResource GhostButtonStyle}">
             <Button.KeyboardAccelerators>
                 <KeyboardAccelerator Key="Escape" />
diff --git a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Controls/LyricsWindowSwitchControl.xaml.cs b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Controls/LyricsWindowSwitchControl.xaml.cs
index 24cef34..148c0d1 100644
--- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Controls/LyricsWindowSwitchControl.xaml.cs
+++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Controls/LyricsWindowSwitchControl.xaml.cs
@@ -14,6 +14,7 @@ using System.Collections.Generic;
 using System.IO;
 using System.Linq;
 using System.Runtime.InteropServices.WindowsRuntime;
+using System.Threading.Tasks;
 using Windows.Foundation;
 using Windows.Foundation.Collections;
 
@@ -32,13 +33,21 @@ namespace BetterLyrics.WinUI3.Controls
             DataContext = Ioc.Default.GetRequiredService<LyricsWindowSwitchControlViewModel>();
         }
 
-        private void Grid_Tapped(object sender, TappedRoutedEventArgs e)
+        private async void Grid_Tapped(object sender, TappedRoutedEventArgs e)
         {
-            WindowHelper.HideWindow<LyricsWindowSwitchWindow>();
+            await HideAsync();
         }
 
-        private void Button_Click(object sender, RoutedEventArgs e)
+        private async void Button_Click(object sender, RoutedEventArgs e)
         {
+            await HideAsync();
+        }
+
+        private async Task HideAsync()
+        {
+            var lyricsWindowSwitchWindow = WindowHelper.GetWindowByWindowType<LyricsWindowSwitchWindow>();
+            lyricsWindowSwitchWindow?.ViewModel.RootGridOpacity = 0;
+            await Task.Delay(300);
             WindowHelper.HideWindow<LyricsWindowSwitchWindow>();
         }
     }
diff --git a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Controls/SystemTray.xaml b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Controls/SystemTray.xaml
index 23d6393..54dea0b 100644
--- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Controls/SystemTray.xaml
+++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Controls/SystemTray.xaml
@@ -29,6 +29,11 @@
                         <Setter Property="MinWidth" Value="600" />
                     </Style>
                 </MenuFlyout.MenuFlyoutPresenterStyle>
+                <MenuFlyoutItem
+                    x:Uid="SystemTraySwitch"
+                    Command="{x:Bind ViewModel.OpenLyricsWindowSwitchCommand}"
+                    Icon="{ui:FontIcon FontFamily={StaticResource IconFontFamily},
+                                       Glyph=&#xE8AB;}" />
                 <MenuFlyoutItem
                     x:Uid="SystemTrayLyrics"
                     Command="{x:Bind ViewModel.OpenLyricsCommand}"
@@ -44,13 +49,11 @@
                     Command="{x:Bind ViewModel.OpenSettingsCommand}"
                     Icon="{ui:FontIcon FontFamily={StaticResource IconFontFamily},
                                        Glyph=&#xE713;}" />
-                <MenuFlyoutSeparator />
                 <MenuFlyoutItem
                     x:Uid="SystemTrayResetWindowPosition"
                     Command="{x:Bind ViewModel.ResetWindowPositionCommand}"
                     Icon="{ui:FontIcon FontFamily={StaticResource IconFontFamily},
                                        Glyph=&#xE923;}" />
-                <MenuFlyoutSeparator />
                 <MenuFlyoutItem
                     x:Uid="SystemTrayRestart"
                     Command="{x:Bind ViewModel.RestartAppCommand}"
diff --git a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Helper/WindowHelper.cs b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Helper/WindowHelper.cs
index deff3a6..a0b9dc9 100644
--- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Helper/WindowHelper.cs
+++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Helper/WindowHelper.cs
@@ -11,6 +11,7 @@ using Microsoft.UI.Xaml;
 using System;
 using System.Collections.Generic;
 using System.Runtime.InteropServices;
+using System.Threading.Tasks;
 using Vanara.PInvoke;
 using Windows.ApplicationModel.Core;
 using Windows.Foundation;
@@ -33,10 +34,8 @@ namespace BetterLyrics.WinUI3.Helper
         public static void HideWindow<T>()
         {
             var window = _activeWindows.Find(w => w is T);
-            if (window is Window w)
-            {
-                w.Hide();
-            }
+            var castedWindow = window as Window;
+            castedWindow?.Hide();
         }
 
         public static void CloseWindow<T>()
diff --git a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Strings/en-US/Resources.resw b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Strings/en-US/Resources.resw
index 164b054..f3c54ab 100644
--- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Strings/en-US/Resources.resw
+++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Strings/en-US/Resources.resw
@@ -303,6 +303,9 @@
   <data name="LyricsWindowSettingsControlSetDefault.Text" xml:space="preserve">
     <value>Set as default</value>
   </data>
+  <data name="LyricsWindowSwitchButtonToolTip.Content" xml:space="preserve">
+    <value>Lyrics window switcher</value>
+  </data>
   <data name="MainPageAlbumArtOnly.Content" xml:space="preserve">
     <value>Album art area only</value>
   </data>
@@ -331,9 +334,6 @@ If you encounter any problems, please go to the Settings page, About tab, and vi
   <data name="MainPageWelcomeTeachingTip.Title" xml:space="preserve">
     <value>Welcome to BetterLyrics</value>
   </data>
-  <data name="MainWindowImmersiveMode.ToolTipService.ToolTip" xml:space="preserve">
-    <value>Immersive mode</value>
-  </data>
   <data name="MusicGalleryPageAddToCustomList.Content" xml:space="preserve">
     <value>Add to playlist</value>
   </data>
@@ -520,6 +520,9 @@ If you encounter any problems, please go to the Settings page, About tab, and vi
   <data name="SettingsPageApply.Content" xml:space="preserve">
     <value>Apply</value>
   </data>
+  <data name="SettingsPageAutoAdjust.Header" xml:space="preserve">
+    <value>Automatic adjustment</value>
+  </data>
   <data name="SettingsPageAutoStart.Header" xml:space="preserve">
     <value>Automatic startup</value>
   </data>
@@ -622,9 +625,6 @@ If you encounter any problems, please go to the Settings page, About tab, and vi
   <data name="SettingsPageDragArea.Header" xml:space="preserve">
     <value>Draggable area</value>
   </data>
-  <data name="SettingsPageAutoAdjust.Header" xml:space="preserve">
-    <value>Automatic adjustment</value>
-  </data>
   <data name="SettingsPageEasingFuncType.Header" xml:space="preserve">
     <value>Easing animation type</value>
   </data>
@@ -1255,6 +1255,9 @@ 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="SystemTraySwitch.Text" xml:space="preserve">
+    <value>Lyrics window switcher</value>
+  </data>
   <data name="TranslateServerNotSet" xml:space="preserve">
     <value>Translate server is not set, please configure it in settings first</value>
   </data>
diff --git a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Strings/ja-JP/Resources.resw b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Strings/ja-JP/Resources.resw
index 7ff11c9..d970b17 100644
--- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Strings/ja-JP/Resources.resw
+++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Strings/ja-JP/Resources.resw
@@ -303,6 +303,9 @@
   <data name="LyricsWindowSettingsControlSetDefault.Text" xml:space="preserve">
     <value>既定のブラウザーに設定する</value>
   </data>
+  <data name="LyricsWindowSwitchButtonToolTip.Content" xml:space="preserve">
+    <value>歌詞ウィンドウスイッチャー</value>
+  </data>
   <data name="MainPageAlbumArtOnly.Content" xml:space="preserve">
     <value>アルバムアートエリアのみ</value>
   </data>
@@ -331,9 +334,6 @@
   <data name="MainPageWelcomeTeachingTip.Title" xml:space="preserve">
     <value>BetterLyrics へようこそ</value>
   </data>
-  <data name="MainWindowImmersiveMode.ToolTipService.ToolTip" xml:space="preserve">
-    <value>没入モード</value>
-  </data>
   <data name="MusicGalleryPageAddToCustomList.Content" xml:space="preserve">
     <value>プレイリストに追加します</value>
   </data>
@@ -1255,6 +1255,9 @@
   <data name="SystemTraySettings.Text" xml:space="preserve">
     <value>設定を開く</value>
   </data>
+  <data name="SystemTraySwitch.Text" xml:space="preserve">
+    <value>歌詞ウィンドウスイッチャー</value>
+  </data>
   <data name="TranslateServerNotSet" xml:space="preserve">
     <value>翻訳サーバーは設定されていません。最初に設定で構成してください</value>
   </data>
diff --git a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Strings/ko-KR/Resources.resw b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Strings/ko-KR/Resources.resw
index 4107dcc..739987e 100644
--- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Strings/ko-KR/Resources.resw
+++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Strings/ko-KR/Resources.resw
@@ -303,6 +303,9 @@
   <data name="LyricsWindowSettingsControlSetDefault.Text" xml:space="preserve">
     <value>기본 값으로 설정</value>
   </data>
+  <data name="LyricsWindowSwitchButtonToolTip.Content" xml:space="preserve">
+    <value>가사 창 전환기</value>
+  </data>
   <data name="MainPageAlbumArtOnly.Content" xml:space="preserve">
     <value>앨범 아트 영역만</value>
   </data>
@@ -331,9 +334,6 @@
   <data name="MainPageWelcomeTeachingTip.Title" xml:space="preserve">
     <value>Betterlyrics에 오신 것을 환영합니다</value>
   </data>
-  <data name="MainWindowImmersiveMode.ToolTipService.ToolTip" xml:space="preserve">
-    <value>몰입 형 모드</value>
-  </data>
   <data name="MusicGalleryPageAddToCustomList.Content" xml:space="preserve">
     <value>재생 목록에 추가하십시오</value>
   </data>
@@ -1255,6 +1255,9 @@
   <data name="SystemTraySettings.Text" xml:space="preserve">
     <value>열기 설정</value>
   </data>
+  <data name="SystemTraySwitch.Text" xml:space="preserve">
+    <value>가사 창 전환기</value>
+  </data>
   <data name="TranslateServerNotSet" xml:space="preserve">
     <value>번역 서버가 설정되지 않았습니다. 먼저 설정으로 구성하십시오.</value>
   </data>
diff --git a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Strings/zh-CN/Resources.resw b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Strings/zh-CN/Resources.resw
index 120aafb..e6ac95b 100644
--- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Strings/zh-CN/Resources.resw
+++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Strings/zh-CN/Resources.resw
@@ -303,6 +303,9 @@
   <data name="LyricsWindowSettingsControlSetDefault.Text" xml:space="preserve">
     <value>设为默认</value>
   </data>
+  <data name="LyricsWindowSwitchButtonToolTip.Content" xml:space="preserve">
+    <value>歌词窗口切换器</value>
+  </data>
   <data name="MainPageAlbumArtOnly.Content" xml:space="preserve">
     <value>仅显示专辑区域</value>
   </data>
@@ -331,9 +334,6 @@
   <data name="MainPageWelcomeTeachingTip.Title" xml:space="preserve">
     <value>欢迎使用 BetterLyrics</value>
   </data>
-  <data name="MainWindowImmersiveMode.ToolTipService.ToolTip" xml:space="preserve">
-    <value>沉浸模式</value>
-  </data>
   <data name="MusicGalleryPageAddToCustomList.Content" xml:space="preserve">
     <value>添加到歌单</value>
   </data>
@@ -1255,6 +1255,9 @@
   <data name="SystemTraySettings.Text" xml:space="preserve">
     <value>打开设置</value>
   </data>
+  <data name="SystemTraySwitch.Text" xml:space="preserve">
+    <value>歌词窗口切换器</value>
+  </data>
   <data name="TranslateServerNotSet" xml:space="preserve">
     <value>未设置Translate服务器，请先在设置中进行配置</value>
   </data>
diff --git a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Strings/zh-TW/Resources.resw b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Strings/zh-TW/Resources.resw
index d2477b1..0f047bd 100644
--- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Strings/zh-TW/Resources.resw
+++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Strings/zh-TW/Resources.resw
@@ -303,6 +303,9 @@
   <data name="LyricsWindowSettingsControlSetDefault.Text" xml:space="preserve">
     <value>設為預設</value>
   </data>
+  <data name="LyricsWindowSwitchButtonToolTip.Content" xml:space="preserve">
+    <value>歌詞視窗切換器</value>
+  </data>
   <data name="MainPageAlbumArtOnly.Content" xml:space="preserve">
     <value>僅限相簿藝術區域</value>
   </data>
@@ -331,9 +334,6 @@
   <data name="MainPageWelcomeTeachingTip.Title" xml:space="preserve">
     <value>歡迎使用 BetterLyrics</value>
   </data>
-  <data name="MainWindowImmersiveMode.ToolTipService.ToolTip" xml:space="preserve">
-    <value>沉浸模式</value>
-  </data>
   <data name="MusicGalleryPageAddToCustomList.Content" xml:space="preserve">
     <value>添加到歌單</value>
   </data>
@@ -1255,6 +1255,9 @@
   <data name="SystemTraySettings.Text" xml:space="preserve">
     <value>打開設置</value>
   </data>
+  <data name="SystemTraySwitch.Text" xml:space="preserve">
+    <value>歌詞視窗切換器</value>
+  </data>
   <data name="TranslateServerNotSet" xml:space="preserve">
     <value>未設定翻譯伺服器，請先在設定中進行配置</value>
   </data>
diff --git a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/ViewModels/LyricsWindowSwitchWindowViewModel.cs b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/ViewModels/LyricsWindowSwitchWindowViewModel.cs
new file mode 100644
index 0000000..6630e97
--- /dev/null
+++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/ViewModels/LyricsWindowSwitchWindowViewModel.cs
@@ -0,0 +1,14 @@
+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 LyricsWindowSwitchWindowViewModel : BaseViewModel
+    {
+        [ObservableProperty] public partial float RootGridOpacity { get; set; } = 1;
+    }
+}
diff --git a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/ViewModels/SystemTrayViewModel.cs b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/ViewModels/SystemTrayViewModel.cs
index 7f3b63e..277ee15 100644
--- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/ViewModels/SystemTrayViewModel.cs
+++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/ViewModels/SystemTrayViewModel.cs
@@ -52,5 +52,11 @@ namespace BetterLyrics.WinUI3.ViewModels
         {
             WindowHelper.OpenOrShowWindow<LyricsWindow>();
         }
+
+        [RelayCommand]
+        private static void OpenLyricsWindowSwitch()
+        {
+            WindowHelper.OpenOrShowWindow<LyricsWindowSwitchWindow>();
+        }
     }
 }
diff --git a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Views/LyricsPage.xaml b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Views/LyricsPage.xaml
index 9a6c163..3ea7821 100644
--- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Views/LyricsPage.xaml
+++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Views/LyricsPage.xaml
@@ -18,7 +18,7 @@
     xmlns:ui="using:CommunityToolkit.WinUI"
     mc:Ignorable="d">
 
-    <Grid x:Name="RootGrid" SizeChanged="RootGrid_SizeChanged">
+    <Grid x:Name="RootGrid" SizeChanged="RootGrid_SizeChanged" RightTapped="RootGrid_RightTapped">
         <!--  Lyrics area  -->
         <renderer:LyricsRenderer />
         <!--<Image Source="/Assets/Cover.jpg" />-->
diff --git a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Views/LyricsPage.xaml.cs b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Views/LyricsPage.xaml.cs
index 8bb1764..41d4667 100644
--- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Views/LyricsPage.xaml.cs
+++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Views/LyricsPage.xaml.cs
@@ -172,5 +172,13 @@ namespace BetterLyrics.WinUI3.Views
         {
             ViewModel.TimelineSliderThumbOpacity = 0f;
         }
+
+        private void RootGrid_RightTapped(object sender, Microsoft.UI.Xaml.Input.RightTappedRoutedEventArgs e)
+        {
+            if (BottomCommandFlyoutContainer.Children.Count != 0)
+            {
+                BottomCommandFlyout.ShowAt(BottomCommandFlyoutTrigger);
+            }
+        }
     }
 }
diff --git a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Views/LyricsWindow.xaml b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Views/LyricsWindow.xaml
index 25d2149..8a1e9eb 100644
--- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Views/LyricsWindow.xaml
+++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Views/LyricsWindow.xaml
@@ -46,7 +46,7 @@
                         <ScalarTransition />
                     </StackPanel.OpacityTransition>
 
-                    <!--  More  -->
+                    <!--  Music gallery  -->
                     <Button Click="MusicGalleryButton_Click" Style="{StaticResource TitleBarButtonStyle}">
                         <FontIcon
                             FontFamily="{StaticResource IconFontFamily}"
@@ -57,6 +57,16 @@
                         </ToolTipService.ToolTip>
                     </Button>
 
+                    <Button Click="LyricsWindowSwitchButton_Click" Style="{StaticResource TitleBarButtonStyle}">
+                        <FontIcon
+                            FontFamily="{StaticResource IconFontFamily}"
+                            FontSize="{x:Bind ViewModel.TitleBarFontSize, Mode=OneWay}"
+                            Glyph="&#xE8AB;" />
+                        <ToolTipService.ToolTip>
+                            <ToolTip x:Uid="LyricsWindowSwitchButtonToolTip" />
+                        </ToolTipService.ToolTip>
+                    </Button>
+
                 </StackPanel>
             </Grid>
 
diff --git a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Views/LyricsWindow.xaml.cs b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Views/LyricsWindow.xaml.cs
index e586771..01d705c 100644
--- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Views/LyricsWindow.xaml.cs
+++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Views/LyricsWindow.xaml.cs
@@ -27,6 +27,8 @@ namespace BetterLyrics.WinUI3.Views
         private readonly ILiveStatesService _liveStatesService = Ioc.Default.GetRequiredService<ILiveStatesService>();
         private readonly WindowMessageMonitor _wmm;
 
+        public LyricsWindowViewModel ViewModel { get; private set; } = Ioc.Default.GetRequiredService<LyricsWindowViewModel>();
+
         public LyricsWindow()
         {
             this.InitializeComponent();
@@ -79,8 +81,6 @@ namespace BetterLyrics.WinUI3.Views
             }
         }
 
-        public LyricsWindowViewModel ViewModel { get; private set; } = Ioc.Default.GetRequiredService<LyricsWindowViewModel>();
-
         private void AppWindow_Changed(AppWindow sender, AppWindowChangedEventArgs args)
         {
             if (args.DidPositionChange || args.DidSizeChange)
@@ -127,5 +127,10 @@ namespace BetterLyrics.WinUI3.Views
         {
             ViewModel.ExitOrClose();
         }
+
+        private void LyricsWindowSwitchButton_Click(object sender, RoutedEventArgs e)
+        {
+            WindowHelper.OpenOrShowWindow<LyricsWindowSwitchWindow>();
+        }
     }
 }
diff --git a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Views/LyricsWindowSwitchWindow.xaml b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Views/LyricsWindowSwitchWindow.xaml
index 632c73b..97fac7b 100644
--- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Views/LyricsWindowSwitchWindow.xaml
+++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Views/LyricsWindowSwitchWindow.xaml
@@ -10,7 +10,10 @@
     Title="LyricsWindowSwitchWindow"
     mc:Ignorable="d">
 
-    <Grid>
+    <Grid x:Name="RootGrid" Opacity="{x:Bind ViewModel.RootGridOpacity, Mode=OneWay}">
+        <Grid.OpacityTransition>
+            <ScalarTransition />
+        </Grid.OpacityTransition>
         <Grid
             x:Name="PlaceholderGrid"
             Width="1"
diff --git a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Views/LyricsWindowSwitchWindow.xaml.cs b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Views/LyricsWindowSwitchWindow.xaml.cs
index cc988ef..9064f60 100644
--- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Views/LyricsWindowSwitchWindow.xaml.cs
+++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Views/LyricsWindowSwitchWindow.xaml.cs
@@ -1,4 +1,6 @@
 using BetterLyrics.WinUI3.Helper;
+using BetterLyrics.WinUI3.ViewModels;
+using CommunityToolkit.Mvvm.DependencyInjection;
 using Microsoft.UI.Xaml;
 using Microsoft.UI.Xaml.Controls;
 using Microsoft.UI.Xaml.Controls.Primitives;
@@ -25,6 +27,8 @@ namespace BetterLyrics.WinUI3.Views
     /// </summary>
     public sealed partial class LyricsWindowSwitchWindow : Window
     {
+        public LyricsWindowSwitchWindowViewModel ViewModel { get; private set; } = Ioc.Default.GetRequiredService<LyricsWindowSwitchWindowViewModel>();
+
         public LyricsWindowSwitchWindow()
         {
             InitializeComponent();
@@ -37,6 +41,19 @@ namespace BetterLyrics.WinUI3.Views
             AppWindow.IsShownInSwitchers = false;
             this.SetIsAlwaysOnTop(true);
             SetTitleBar(PlaceholderGrid);
+
+            AppWindow.Changed += AppWindow_Changed;
+        }
+
+        private void AppWindow_Changed(Microsoft.UI.Windowing.AppWindow sender, Microsoft.UI.Windowing.AppWindowChangedEventArgs args)
+        {
+            if (args.DidVisibilityChange)
+            {
+                if (sender.IsVisible)
+                {
+                    ViewModel.RootGridOpacity = 1;
+                }
+            }
         }
     }
 }