Merge pull request #49 from jayfunc/dev

v1.0.18.0
2026-01-12 19:08:33 +08:00 · 2025-07-19 14:34:34 -04:00
parent 0606711023 a9807f4f09
commit f5638c6880
29 changed files with 591 additions and 238 deletions
--- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3
+++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3
@@ -12,7 +12,7 @@
 	<Identity
 	  Name="37412.BetterLyrics"
 	  Publisher="CN=E1428B0E-DC1D-4EA4-ACB1-4556569D5BA9"
-	  Version="1.0.16.0" />
+	  Version="1.0.18.0" />

 	<mp:PhoneIdentity PhoneProductId="ca4a4830-fc19-40d9-b823-53e2bff3d816" PhonePublisherId="00000000-0000-0000-0000-000000000000"/>

--- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/BetterLyrics.WinUI3.csproj
+++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/BetterLyrics.WinUI3.csproj
@@ -63,6 +63,7 @@
 		<PackageReference Include="TagLibSharp" Version="2.3.0" />
 		<PackageReference Include="Ude.NetStandard" Version="1.2.0" />
 		<PackageReference Include="Vanara.PInvoke.CoreAudio" Version="4.1.6" />
+		<PackageReference Include="Vanara.PInvoke.DwmApi" Version="4.1.6" />
 		<PackageReference Include="Vanara.PInvoke.Gdi32" Version="4.1.6" />
 		<PackageReference Include="Vanara.PInvoke.Shell32" Version="4.1.6" />
 		<PackageReference Include="Vanara.PInvoke.User32" Version="4.1.6" />
--- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Helper/DesktopModeHelper.cs
+++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Helper/DesktopModeHelper.cs
@@ -19,10 +19,8 @@ namespace BetterLyrics.WinUI3.Helper
        private static readonly ISettingsService _settingsService = Ioc.Default.GetRequiredService<ISettingsService>();

        private static readonly Dictionary<IntPtr, bool> _originalTopmostStates = [];
-        private static readonly Dictionary<IntPtr, nint> _oldWndProcs = new();
        private static readonly Dictionary<IntPtr, (double X, double Y, double Width, double Height)> _originalWindowBounds = [];
        private static readonly Dictionary<IntPtr, WindowStyle> _originalWindowStyles = [];
-        private static List<Rectangle> _interactiveRects = new();

        private delegate nint WndProcDelegate(nint hWnd, uint msg, nint wParam, nint lParam);

@@ -103,16 +101,6 @@ namespace BetterLyrics.WinUI3.Helper

                window.ToggleWindowStyle(true, WindowStyle.Popup | WindowStyle.Visible);
                User32.SetWindowLong(hwnd, User32.WindowLongFlags.GWL_EXSTYLE, exStyle | (int)User32.WindowStylesEx.WS_EX_TRANSPARENT | (int)User32.WindowStylesEx.WS_EX_LAYERED);
-
-                //// <20><>װ<EFBFBD>Զ<EFBFBD><D4B6><EFBFBD>WndProc
-                //if (!_oldWndProcs.ContainsKey(hwnd))
-                //{
-                //    nint newWndProc = Marshal.GetFunctionPointerForDelegate((WndProcDelegate)((hWnd, msg, wParam, lParam) =>
-                //        CustomWndProc(hWnd, msg, wParam, lParam, hwnd)
-                //    ));
-                //    nint oldWndProc = User32.SetWindowLong(hwnd, User32.WindowLongFlags.GWLP_WNDPROC, newWndProc);
-                //    _oldWndProcs[hwnd] = oldWndProc;
-                //}
            }
            else
            {
@@ -123,51 +111,7 @@ namespace BetterLyrics.WinUI3.Helper
                    window.SetWindowStyle(style);
                    _originalWindowStyles.Remove(hwnd);
                }
-
-                //// <20>ָ<EFBFBD>ԭWndProc
-                //if (_oldWndProcs.TryGetValue(hwnd, out var oldWndProc))
-                //{
-                //    User32.SetWindowLong(hwnd, User32.WindowLongFlags.GWLP_WNDPROC, oldWndProc);
-                //    _oldWndProcs.Remove(hwnd);
-                //}
            }
        }
-
-        private static nint CustomWndProc(nint hWnd, uint msg, nint wParam, nint lParam, IntPtr hwnd)
-        {
-            const int WM_NCHITTEST = 0x84;
-            const int HTCLIENT = 1;
-            const int HTTRANSPARENT = -1;
-
-            if (msg == WM_NCHITTEST)
-            {
-                int x = (short)(lParam.ToInt32() & 0xFFFF);
-                int y = (short)((lParam.ToInt32() >> 16) & 0xFFFF);
-
-                // תΪ<D7AA><CEAA><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
-                POINT pt = new() { x = x, y = y };
-                User32.ScreenToClient(hWnd, ref pt);
-
-                foreach (var rect in _interactiveRects)
-                {
-                    if (rect.Contains(pt.x, pt.y))
-                        return HTCLIENT;
-                }
-                return HTTRANSPARENT;
-            }
-
-            // <20><><EFBFBD><EFBFBD>ԭWndProc
-            if (_oldWndProcs.TryGetValue(hwnd, out var oldWndProc))
-            {
-                return User32.CallWindowProc(oldWndProc, hWnd, msg, wParam, lParam);
-            }
-            return User32.DefWindowProc(hWnd, msg, wParam, lParam);
-        }
-
-        public static void SetInteractiveRects(IEnumerable<Rectangle> rects)
-        {
-            _interactiveRects = rects.ToList();
-        }
-
    }
 }
--- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Helper/DockModeHelper.cs
+++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Helper/DockModeHelper.cs
@@ -31,11 +31,12 @@ namespace BetterLyrics.WinUI3.Helper
            window.SetIsAlwaysOnTop(false);

            UnregisterAppBar(hwnd);
-            RefreshWorkArea();

            window.SetWindowStyle(_originalWindowStyle[hwnd]);
            _originalWindowStyle.Remove(hwnd);

+            window.ExtendsContentIntoTitleBar = true;
+
            if (_originalPositions.TryGetValue(hwnd, out var rect))
            {
                User32.SetWindowPos(
@@ -54,7 +55,7 @@ namespace BetterLyrics.WinUI3.Helper
        public static void Enable(Window window, int appBarHeight, DockPlacement dockPlacement)
        {
            window.SetIsShownInSwitchers(false);
-            window.ExtendsContentIntoTitleBar = false;
+            //window.ExtendsContentIntoTitleBar = false;
            window.SetIsAlwaysOnTop(true);

            IntPtr hwnd = WindowNative.GetWindowHandle(window);
@@ -63,7 +64,6 @@ namespace BetterLyrics.WinUI3.Helper
            {
                _originalWindowStyle[hwnd] = window.GetWindowStyle();
            }
-            window.SetWindowStyle(WindowStyle.Popup | WindowStyle.Visible);

            if (!_originalPositions.ContainsKey(hwnd))
            {
@@ -78,6 +78,7 @@ namespace BetterLyrics.WinUI3.Helper
            int screenWidth = User32.GetSystemMetrics(User32.SystemMetric.SM_CXSCREEN);
            int screenHeight = User32.GetSystemMetrics(User32.SystemMetric.SM_CYSCREEN);
            int y = dockPlacement == DockPlacement.Top ? 0 : screenHeight - appBarHeight;
+
            User32.SetWindowPos(
                hwnd,
                IntPtr.Zero,
@@ -85,10 +86,11 @@ namespace BetterLyrics.WinUI3.Helper
                y,
                screenWidth,
                appBarHeight,
-                User32.SetWindowPosFlags.SWP_SHOWWINDOW
+                User32.SetWindowPosFlags.SWP_HIDEWINDOW
            );
-
-            RefreshWorkArea();
+            window.ExtendsContentIntoTitleBar = false;
+            window.ToggleWindowStyle(true, WindowStyle.Popup);
+            window.Show();
        }

        private static void RegisterAppBar(IntPtr hwnd, int height, DockPlacement dockPlacement)
@@ -114,7 +116,9 @@ namespace BetterLyrics.WinUI3.Helper
                },
            };

+            // Ref: https://github.com/TwilightLemon/AppBarTest/blob/master/AppBarCreator.cs
            Shell32.SHAppBarMessage(Shell32.ABM.ABM_NEW, ref abd);
+            Shell32.SHAppBarMessage(Shell32.ABM.ABM_QUERYPOS, ref abd);
            Shell32.SHAppBarMessage(Shell32.ABM.ABM_SETPOS, ref abd);

            _registered.Add(hwnd);
@@ -167,6 +171,7 @@ namespace BetterLyrics.WinUI3.Helper
                    },
                };

+                Shell32.SHAppBarMessage(Shell32.ABM.ABM_QUERYPOS, ref abd);
                Shell32.SHAppBarMessage(Shell32.ABM.ABM_SETPOS, ref abd);

                // 同步窗口实际高度和位置
@@ -178,10 +183,8 @@ namespace BetterLyrics.WinUI3.Helper
                    y,
                    User32.GetSystemMetrics(User32.SystemMetric.SM_CXSCREEN),
                    newHeight,
-                    User32.SetWindowPosFlags.SWP_SHOWWINDOW
+                    newHeight == 0 ? User32.SetWindowPosFlags.SWP_HIDEWINDOW : User32.SetWindowPosFlags.SWP_SHOWWINDOW
                );
-
-                RefreshWorkArea();
            }, TimeSpan.FromMilliseconds(100));
        }
    }
--- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Helper/FontHelper.cs
+++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Helper/FontHelper.cs
@@ -0,0 +1,20 @@
+using BetterLyrics.WinUI3.Services;
+using CommunityToolkit.Mvvm.DependencyInjection;
+using Microsoft.Graphics.Canvas.Text;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace BetterLyrics.WinUI3.Helper
+{
+    public static class FontHelper
+    {
+        private static readonly ISettingsService _settingsService = Ioc.Default.GetRequiredService<ISettingsService>();
+
+        public static string[] SystemFontFamilies => CanvasTextFormat.GetSystemFontFamilies();
+
+        public static string GetUserPreferredFontFamily() => SystemFontFamilies.ElementAtOrDefault(_settingsService.SelectedFontFamilyIndex) ?? "Segoe UI";
+    }
+}
--- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Helper/LyricsParser.cs
+++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Helper/LyricsParser.cs
@@ -47,7 +47,6 @@ namespace BetterLyrics.WinUI3.Helper
                        break;
                }
            }
-            PostProcessLyricsLines(durationMs.Value);
            _lyricsDataArr.Add(new LyricsData()); // 为机翻预留
            return _lyricsDataArr;
        }
@@ -374,29 +373,5 @@ namespace BetterLyrics.WinUI3.Helper

            _lyricsDataArr.Add(new LyricsData(lyricsLines));
        }
-
-        private void PostProcessLyricsLines(int durationMs)
-        {
-            for (int langIdx = 0; langIdx < _lyricsDataArr.Count; langIdx++)
-            {
-                var lines = _lyricsDataArr[langIdx].LyricsLines;
-                if (lines.Count > 0)
-                {
-                    if (lines[0].StartMs > 0)
-                    {
-                        lines.Insert(
-                            0,
-                            new LyricsLine
-                            {
-                                StartMs = 0,
-                                EndMs = lines[0].StartMs,
-                                OriginalText = "● ● ●",
-                                LyricsChars = [],
-                            }
-                        );
-                    }
-                }
-            }
-        }
    }
 }
--- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Services/IPlaybackService.cs
+++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Services/IPlaybackService.cs
@@ -21,6 +21,6 @@ namespace BetterLyrics.WinUI3.Services
        Task NextAsync();

        bool IsPlaying { get; }
-
+        SongInfo? SongInfo { get; }
    }
 }
--- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Services/ISettingsService.cs
+++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Services/ISettingsService.cs
@@ -96,5 +96,10 @@ namespace BetterLyrics.WinUI3.Services
        bool IsImmersiveMode { get; set; }
        string LXMusicServer { get; set; }
        DockPlacement DockPlacement { get; set; }
+        bool HideWindowWhenNotPlaying { get; set; }
+        int DockWindowHeight { get; set; }
+        int SelectedFontFamilyIndex { get; set; }
+        string LyricsFontFamily { get; set; }
+        bool IsDragEverywhereEnabled { get; set; }
    }
 }
--- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Services/PlaybackService.cs
+++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Services/PlaybackService.cs
@@ -64,6 +64,7 @@ namespace BetterLyrics.WinUI3.Services
        }

        public bool IsPlaying => _cachedIsPlaying;
+        public SongInfo? SongInfo => _cachedSongInfo;

        private bool IsMediaSourceEnabled(string id)
        {
--- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Services/SettingsService.cs
+++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Services/SettingsService.cs
@@ -96,6 +96,12 @@ namespace BetterLyrics.WinUI3.Services
        private const string LockHotKeyIndexKey = "LockHotKeyIndex";
        private const string DockPlacementKey = "DockPlacement";
        private const string LyricsBgFontOpacityKey = "LyricsBgFontOpacity";
+        private const string HideWindowWhenNotPlayingKey = "HideWindowWhenNotPlaying";
+        private const string DockWindowHeightKey = "DockWindowHeight";
+
+        private const string SelectedFontFamilyIndexKey = "SelectedFontFamilyIndex";
+        private const string LyricsFontFamilyKey = "LyricsFontFamily";
+        private const string IsDragEverywhereEnabledKey = "IsDragEverywhereEnabled";

        private readonly ApplicationDataContainer _localSettings;

@@ -221,6 +227,41 @@ namespace BetterLyrics.WinUI3.Services
            SetDefault(LockHotKeyIndexKey, 'U' - 'A');
            SetDefault(DockPlacementKey, (int)DockPlacement.Top);
            SetDefault(LyricsBgFontOpacityKey, 30); // 30%
+            SetDefault(HideWindowWhenNotPlayingKey, false);
+            SetDefault(DockWindowHeightKey, 64); // 64px
+            SetDefault(SelectedFontFamilyIndexKey, 0);
+            SetDefault(LyricsFontFamilyKey, FontHelper.SystemFontFamilies.ElementAtOrDefault(0));
+            SetDefault(IsDragEverywhereEnabledKey, true);
+        }
+
+        public bool IsDragEverywhereEnabled
+        {
+            get => GetValue<bool>(IsDragEverywhereEnabledKey);
+            set => SetValue(IsDragEverywhereEnabledKey, value);
+        }
+
+        public string LyricsFontFamily
+        {
+            get => GetValue<string>(LyricsFontFamilyKey)!;
+            set => SetValue(LyricsFontFamilyKey, value);
+        }
+
+        public int SelectedFontFamilyIndex
+        {
+            get => GetValue<int>(SelectedFontFamilyIndexKey);
+            set => SetValue(SelectedFontFamilyIndexKey, value);
+        }
+
+        public bool HideWindowWhenNotPlaying
+        {
+            get => GetValue<bool>(HideWindowWhenNotPlayingKey);
+            set => SetValue(HideWindowWhenNotPlayingKey, value);
+        }
+
+        public int DockWindowHeight
+        {
+            get => GetValue<int>(DockWindowHeightKey);
+            set => SetValue(DockWindowHeightKey, value);
        }

        public int LyricsBgFontOpacity
--- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Strings/en-US/Resources.resw
+++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Strings/en-US/Resources.resw
@@ -775,4 +775,22 @@ If you encounter any problems, please go to the Settings page, About tab, and vi
  <data name="FailToStartLXMusicServer" xml:space="preserve">
    <value>Unable to connect to LX Music server, please go to Settings - Advanced options to check if the link is entered correctly</value>
  </data>
+  <data name="SettingsPageHideWindow.Header" xml:space="preserve">
+    <value>Auto-hide window</value>
+  </data>
+  <data name="SettingsPageHideWindow.Description" xml:space="preserve">
+    <value>Automatically hide the window when no songs are playing in dock mode or desktop mode</value>
+  </data>
+  <data name="SettingsPageDockWindowHeight.Header" xml:space="preserve">
+    <value>Window height</value>
+  </data>
+  <data name="SettingsPageLyricsFontFamily.Header" xml:space="preserve">
+    <value>Lyrics font family</value>
+  </data>
+  <data name="SettingsPageGlobalDrag.Header" xml:space="preserve">
+    <value>Global drag</value>
+  </data>
+  <data name="SettingsPageGlobalDrag.Description" xml:space="preserve">
+    <value>Extend the title bar to the entire page so that the window can be dragged in any non-interactive area</value>
+  </data>
 </root>
--- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Strings/ja-JP/Resources.resw
+++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Strings/ja-JP/Resources.resw
@@ -775,4 +775,22 @@
  <data name="FailToStartLXMusicServer" xml:space="preserve">
    <value>LX Music Serverに接続できない場合は、設定に移動してください。リンクが正しく入力されているかどうかを確認するための高度なオプションに移動してください</value>
  </data>
+  <data name="SettingsPageHideWindow.Header" xml:space="preserve">
+    <value>自動ハイドウィンドウ</value>
+  </data>
+  <data name="SettingsPageHideWindow.Description" xml:space="preserve">
+    <value>ドックモードやデスクトップモードで再生されている曲がないときにウィンドウを自動的に非表示にする</value>
+  </data>
+  <data name="SettingsPageDockWindowHeight.Header" xml:space="preserve">
+    <value>窓の高さ</value>
+  </data>
+  <data name="SettingsPageLyricsFontFamily.Header" xml:space="preserve">
+    <value>歌詞フォントファミリー</value>
+  </data>
+  <data name="SettingsPageGlobalDrag.Header" xml:space="preserve">
+    <value>グローバルドラッグ</value>
+  </data>
+  <data name="SettingsPageGlobalDrag.Description" xml:space="preserve">
+    <value>タイトルバーをページ全体に拡張して、ウィンドウを非対話領域でドラッグできるようにします</value>
+  </data>
 </root>
--- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Strings/ko-KR/Resources.resw
+++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Strings/ko-KR/Resources.resw
@@ -775,4 +775,22 @@
  <data name="FailToStartLXMusicServer" xml:space="preserve">
    <value>LX Music Server에 연결할 수 없습니다. 설정으로 이동하십시오 - 고급 옵션이 링크가 올바르게 입력되었는지 확인하십시오.</value>
  </data>
+  <data name="SettingsPageHideWindow.Header" xml:space="preserve">
+    <value>자동 가죽 창</value>
+  </data>
+  <data name="SettingsPageHideWindow.Description" xml:space="preserve">
+    <value>도크 모드 또는 데스크탑 모드에서 재생되지 않을 때는 창을 자동으로 숨기고 있습니다.</value>
+  </data>
+  <data name="SettingsPageDockWindowHeight.Header" xml:space="preserve">
+    <value>창 높이</value>
+  </data>
+  <data name="SettingsPageLyricsFontFamily.Header" xml:space="preserve">
+    <value>가사 글꼴 가족</value>
+  </data>
+  <data name="SettingsPageGlobalDrag.Header" xml:space="preserve">
+    <value>글로벌 드래그</value>
+  </data>
+  <data name="SettingsPageGlobalDrag.Description" xml:space="preserve">
+    <value>비 중과 영역에서 창을 드래그 할 수 있도록 제목 표시 줄을 전체 페이지로 확장하십시오.</value>
+  </data>
 </root>
--- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Strings/zh-CN/Resources.resw
+++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Strings/zh-CN/Resources.resw
@@ -775,4 +775,22 @@
  <data name="FailToStartLXMusicServer" xml:space="preserve">
    <value>无法连接到 LX 音乐服务器，请转到设置 - 高级选项以检查是否正确输入链接</value>
  </data>
+  <data name="SettingsPageHideWindow.Header" xml:space="preserve">
+    <value>自动隐藏窗口</value>
+  </data>
+  <data name="SettingsPageHideWindow.Description" xml:space="preserve">
+    <value>停靠模式或桌面模式下，无歌曲正在播放时，自动隐藏窗口</value>
+  </data>
+  <data name="SettingsPageDockWindowHeight.Header" xml:space="preserve">
+    <value>窗口高度</value>
+  </data>
+  <data name="SettingsPageLyricsFontFamily.Header" xml:space="preserve">
+    <value>歌词字体</value>
+  </data>
+  <data name="SettingsPageGlobalDrag.Header" xml:space="preserve">
+    <value>全局拖拽</value>
+  </data>
+  <data name="SettingsPageGlobalDrag.Description" xml:space="preserve">
+    <value>将标题栏扩展至整个页面使得在任意非交互区域均可拖拽窗口</value>
+  </data>
 </root>
--- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Strings/zh-TW/Resources.resw
+++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Strings/zh-TW/Resources.resw
@@ -775,4 +775,22 @@
  <data name="FailToStartLXMusicServer" xml:space="preserve">
    <value>無法連接到 LX 音樂服務器，請轉到設置 - 高級選項以檢查是否正確輸入鏈接</value>
  </data>
+  <data name="SettingsPageHideWindow.Header" xml:space="preserve">
+    <value>自動隱藏窗口</value>
+  </data>
+  <data name="SettingsPageHideWindow.Description" xml:space="preserve">
+    <value>停靠模式或桌面模式下，無歌曲正在播放時，自動隱藏窗口</value>
+  </data>
+  <data name="SettingsPageDockWindowHeight.Header" xml:space="preserve">
+    <value>窗口高度</value>
+  </data>
+  <data name="SettingsPageLyricsFontFamily.Header" xml:space="preserve">
+    <value>歌詞字體</value>
+  </data>
+  <data name="SettingsPageGlobalDrag.Header" xml:space="preserve">
+    <value>全域拖曳</value>
+  </data>
+  <data name="SettingsPageGlobalDrag.Description" xml:space="preserve">
+    <value>將標題列擴展至整個頁面使得在任意非互動區域均可拖曳窗口</value>
+  </data>
 </root>
--- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/ViewModels/LyricsPageViewModel.cs
+++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/ViewModels/LyricsPageViewModel.cs
@@ -15,7 +15,10 @@ using System.Threading.Tasks;

 namespace BetterLyrics.WinUI3.ViewModels
 {
-    public partial class LyricsPageViewModel : BaseViewModel, IRecipient<PropertyChangedMessage<bool>>
+    public partial class LyricsPageViewModel : BaseViewModel, 
+        IRecipient<PropertyChangedMessage<bool>>, 
+        IRecipient<PropertyChangedMessage<int>>,
+        IRecipient<PropertyChangedMessage<string>>
    {
        private readonly IPlaybackService _playbackService;

@@ -28,6 +31,8 @@ namespace BetterLyrics.WinUI3.ViewModels
            PositionOffset = _settingsService.PositionOffset;
            IsImmersiveMode = _settingsService.IsImmersiveMode;
            ShowTranslationOnly = _settingsService.ShowTranslationOnly;
+            LyricsFontSize = _settingsService.LyricsFontSize;
+            LyricsFontFamily = _settingsService.LyricsFontFamily;

            OnIsImmersiveModeChanged(IsImmersiveMode);

@@ -63,6 +68,15 @@ namespace BetterLyrics.WinUI3.ViewModels
        //[ObservableProperty]
        //public partial int Volume { get; set; }

+        [ObservableProperty]
+        public partial string LyricsFontFamily { get; set; }
+
+        [ObservableProperty]
+        public partial int LyricsFontSize { get; set; }
+
+        [ObservableProperty]
+        public partial Vector3 BottomRightCommandGridTranslation { get; set; } = new Vector3(0, 0, 0);
+
        [ObservableProperty]
        public partial Vector3 BottomCenterCommandGridTranslation { get; set; } = new Vector3(0, 0, 0);

@@ -121,7 +135,6 @@ namespace BetterLyrics.WinUI3.ViewModels
                    {
                        DisplayType = _settingsService.DisplayType;
                    }
-                    BottomCommandGridMargin = message.NewValue ? new Thickness(0) : new Thickness(12);
                }
                else if (message.PropertyName == nameof(LyricsWindowViewModel.IsDesktopMode))
                {
@@ -204,6 +217,28 @@ namespace BetterLyrics.WinUI3.ViewModels
            _settingsService.ShowTranslationOnly = value;
        }

+        public void Receive(PropertyChangedMessage<int> message)
+        {
+            if (message.Sender is SettingsPageViewModel)
+            {
+                if (message.PropertyName == nameof(SettingsPageViewModel.LyricsFontSize))
+                {
+                    LyricsFontSize = message.NewValue;
+                }
+            }
+        }
+
+        public void Receive(PropertyChangedMessage<string> message)
+        {
+            if (message.Sender is SettingsPageViewModel)
+            {
+                if (message.PropertyName == nameof(SettingsPageViewModel.LyricsFontFamily))
+                {
+                    LyricsFontFamily = message.NewValue;
+                }
+            }
+        }
+
        //partial void OnVolumeChanged(int value)
        //{
        //    SystemVolumeHelper.SetMasterVolume(value);
--- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/ViewModels/LyricsRendererViewModel.Ctor.cs
+++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/ViewModels/LyricsRendererViewModel.Ctor.cs
@@ -26,6 +26,8 @@ namespace BetterLyrics.WinUI3.ViewModels

            _lyricsTextFormat.FontWeight = _settingsService.LyricsFontWeight.ToFontWeight();

+            _lyricsTextFormat.FontFamily = _artistTextFormat.FontFamily = _titleTextFormat.FontFamily = _settingsService.LyricsFontFamily;
+
            _lyricsAlignmentType = _settingsService.LyricsAlignmentType;
            _lyricsVerticalEdgeOpacity = _settingsService.LyricsVerticalEdgeOpacity;
            _lyricsLineSpacingFactor = _settingsService.LyricsLineSpacingFactor;
--- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/ViewModels/LyricsRendererViewModel.Messages.cs
+++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/ViewModels/LyricsRendererViewModel.Messages.cs
@@ -12,6 +12,7 @@ namespace BetterLyrics.WinUI3.ViewModels
 {
    public partial class LyricsRendererViewModel
        : IRecipient<PropertyChangedMessage<int>>,
+            IRecipient<PropertyChangedMessage<string>>,
            IRecipient<PropertyChangedMessage<float>>,
            IRecipient<PropertyChangedMessage<bool>>,
            IRecipient<PropertyChangedMessage<Color>>,
@@ -320,5 +321,17 @@ namespace BetterLyrics.WinUI3.ViewModels
                }
            }
        }
+
+        public void Receive(PropertyChangedMessage<string> message)
+        {
+            if (message.Sender is SettingsPageViewModel)
+            {
+                if (message.PropertyName == nameof(SettingsPageViewModel.LyricsFontFamily))
+                {
+                    _lyricsTextFormat.FontFamily = _artistTextFormat.FontFamily = _titleTextFormat.FontFamily = message.NewValue;
+                    _isLayoutChanged = true;
+                }
+            }
+        }
    }
 }
--- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/ViewModels/LyricsRendererViewModel.cs
+++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/ViewModels/LyricsRendererViewModel.cs
@@ -193,12 +193,14 @@ namespace BetterLyrics.WinUI3.ViewModels

        private int GetCurrentPlayingLineIndex()
        {
+            var totalMs = _totalTime.TotalMilliseconds + _positionOffset.TotalMilliseconds;
+            if (totalMs < _lyricsDataArr.ElementAtOrDefault(_langIndex)?.LyricsLines.FirstOrDefault()?.StartMs) return 0;
+
            for (int i = 0; i < _lyricsDataArr.ElementAtOrDefault(_langIndex)?.LyricsLines.Count; i++)
            {
                var line = _lyricsDataArr.ElementAtOrDefault(_langIndex)?.LyricsLines.ElementAtOrDefault(i);
                if (line == null) continue;
                var nextLine = _lyricsDataArr.ElementAtOrDefault(_langIndex)?.LyricsLines.ElementAtOrDefault(i + 1);
-                var totalMs = _totalTime.TotalMilliseconds + _positionOffset.TotalMilliseconds;
                if (nextLine != null && line.StartMs <= totalMs && totalMs < nextLine.StartMs)
                {
                    return i;
@@ -411,7 +413,9 @@ namespace BetterLyrics.WinUI3.ViewModels
        {
            _logger.LogInformation("Showing translation for lyrics...");
            string targetLangCode = LanguageHelper.GetUserTargetLanguageCode();
-            string originalText = _lyricsDataArr[0].WrappedOriginalText;
+            string? originalText = _lyricsDataArr.FirstOrDefault()?.WrappedOriginalText;
+            if (originalText == null) return;
+
            string? originalLangCode = LanguageHelper.DetectLanguageCode(originalText);

            if (originalLangCode == targetLangCode)
@@ -530,6 +534,10 @@ namespace BetterLyrics.WinUI3.ViewModels
                foreach (var data in translationData)
                {
                    data.LyricsLines = data.LyricsLines.Where(line => !string.IsNullOrWhiteSpace(line.OriginalText)).ToList();
+                    foreach (var item in data.LyricsLines)
+                    {
+                        if (item.OriginalText == "//") item.OriginalText = "";
+                    }
                }
                _lyricsDataArr = _lyricsDataArr.Concat(translationData).ToList();
            }
--- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/ViewModels/LyricsWindowViewModel.cs
+++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/ViewModels/LyricsWindowViewModel.cs
@@ -7,6 +7,7 @@ using BetterLyrics.WinUI3.Services;
 using BetterLyrics.WinUI3.ViewModels;
 using BetterLyrics.WinUI3.Views;
 using CommunityToolkit.Mvvm.ComponentModel;
+using CommunityToolkit.Mvvm.DependencyInjection;
 using CommunityToolkit.Mvvm.Input;
 using CommunityToolkit.Mvvm.Messaging;
 using CommunityToolkit.Mvvm.Messaging.Messages;
@@ -31,20 +32,29 @@ namespace BetterLyrics.WinUI3
            IRecipient<PropertyChangedMessage<ElementTheme>>,
            IRecipient<PropertyChangedMessage<DockPlacement>>
    {
+        private readonly IPlaybackService _playbackService = Ioc.Default.GetRequiredService<IPlaybackService>();
        private ForegroundWindowWatcher? _windowWatcher = null;
-        private bool _ignoreFullscreenWindow = false;
-        private int _dockWindowMinHeight = 96;
+        private bool _ignoreFullscreenWindow;
+        private bool _hideWindowWhenNotPlaying;

        private DockPlacement _dockPlacement;
-        private int _lyricsFontSize;
+        private int _dockWindowHeight;

        public LyricsWindowViewModel(ISettingsService settingsService) : base(settingsService)
        {
            _ignoreFullscreenWindow = _settingsService.IgnoreFullscreenWindow;
+            _hideWindowWhenNotPlaying = _settingsService.HideWindowWhenNotPlaying;
            IsImmersiveMode = _settingsService.IsImmersiveMode;
            _dockPlacement = _settingsService.DockPlacement;
-            _lyricsFontSize = _settingsService.LyricsFontSize;
+            _dockWindowHeight = _settingsService.DockWindowHeight;
            OnIsImmersiveModeChanged(_settingsService.IsImmersiveMode);
+
+            _playbackService.SongInfoChanged += PlaybackService_SongInfoChanged;
+        }
+
+        private void PlaybackService_SongInfoChanged(object? sender, Events.SongInfoChangedEventArgs e)
+        {
+            AutoHideOrShowWindow();
        }

        [ObservableProperty]
@@ -83,12 +93,43 @@ namespace BetterLyrics.WinUI3
        [ObservableProperty]
        public partial string LockHotKey { get; set; } = "";

+        private void AutoHideOrShowWindow()
+        {
+            var window = WindowHelper.GetWindowByWindowType<LyricsWindow>();
+            if (window == null) return;
+
+            var hwnd = WindowNative.GetWindowHandle(window);
+
+            if (IsDockMode || IsDesktopMode)
+            {
+                if (_hideWindowWhenNotPlaying && _playbackService.SongInfo == null)
+                {
+                    if (IsDockMode)
+                    {
+                        DockModeHelper.UpdateAppBarHeight(hwnd, 0, _dockPlacement);
+                    }
+                    window.Hide();
+                }
+                else
+                {
+                    if (IsDockMode)
+                    {
+                        DockModeHelper.UpdateAppBarHeight(hwnd, _dockWindowHeight, _dockPlacement);
+                    }
+                    window.Show();
+                }
+            }
+        }
+
        private void UpdateDockWindow()
        {
            var window = WindowHelper.GetWindowByWindowType<LyricsWindow>();
            if (window == null) return;

-            DockModeHelper.UpdateAppBarHeight(WindowNative.GetWindowHandle(window), Math.Max(_dockWindowMinHeight, _lyricsFontSize * 4), _dockPlacement);
+            if (!_hideWindowWhenNotPlaying || _playbackService.SongInfo != null)
+            {
+                DockModeHelper.UpdateAppBarHeight(WindowNative.GetWindowHandle(window), _dockWindowHeight, _dockPlacement);
+            }
        }

        partial void OnIsImmersiveModeChanged(bool value)
@@ -121,6 +162,11 @@ namespace BetterLyrics.WinUI3
                {
                    _ignoreFullscreenWindow = message.NewValue;
                }
+                else if (message.PropertyName == nameof(SettingsPageViewModel.HideWindowWhenNotPlaying))
+                {
+                    _hideWindowWhenNotPlaying = message.NewValue;
+                    AutoHideOrShowWindow();
+                }
            }
        }

@@ -139,9 +185,9 @@ namespace BetterLyrics.WinUI3
        {
            if (message.Sender is SettingsPageViewModel)
            {
-                if (message.PropertyName == nameof(SettingsPageViewModel.LyricsFontSize))
+                if (message.PropertyName == nameof(SettingsPageViewModel.DockWindowHeight))
                {
-                    _lyricsFontSize = message.NewValue;
+                    _dockWindowHeight = message.NewValue;
                    UpdateDockWindow();
                }
                else if (message.Sender is SettingsPageViewModel)
@@ -231,6 +277,8 @@ namespace BetterLyrics.WinUI3
                IsLyricsWindowLocked = true;
                IsImmersiveMode = true;
            }
+
+            AutoHideOrShowWindow();
        }

        [RelayCommand]
@@ -264,13 +312,15 @@ namespace BetterLyrics.WinUI3
            IsDockMode = !IsDockMode;
            if (IsDockMode)
            {
-                DockModeHelper.Enable(window, Math.Max(_dockWindowMinHeight, _lyricsFontSize * 4), _dockPlacement);
+                DockModeHelper.Enable(window, _dockWindowHeight, _dockPlacement);
                StartWatchWindowColorChange();
            }
            else
            {
                DockModeHelper.Disable(window);
            }
+
+            AutoHideOrShowWindow();
        }

        [RelayCommand]
--- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/ViewModels/SettingsPageViewModel.cs
+++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/ViewModels/SettingsPageViewModel.cs
@@ -8,6 +8,7 @@ using BetterLyrics.WinUI3.Views;
 using CommunityToolkit.Mvvm.ComponentModel;
 using CommunityToolkit.Mvvm.Input;
 using CommunityToolkit.Mvvm.Messaging;
+using Microsoft.Graphics.Canvas.Text;
 using Microsoft.UI.Xaml;
 using Microsoft.UI.Xaml.Controls;
 using ShadowViewer.Controls;
@@ -97,6 +98,13 @@ namespace BetterLyrics.WinUI3.ViewModels
            LXMusicServer = _settingsService.LXMusicServer;
            DockPlacement = _settingsService.DockPlacement;
            LyricsBgFontOpacity = _settingsService.LyricsBgFontOpacity;
+            HideWindowWhenNotPlaying = _settingsService.HideWindowWhenNotPlaying;
+            DockWindowHeight = _settingsService.DockWindowHeight;
+
+            SystemFontNames = [.. FontHelper.SystemFontFamilies];
+            SelectedFontFamilyIndex = _settingsService.SelectedFontFamilyIndex;
+            LyricsFontFamily = _settingsService.LyricsFontFamily;
+            IsDragEverywhereEnabled = _settingsService.IsDragEverywhereEnabled;

            _playbackService.MediaSourceProvidersInfoChanged += PlaybackService_SessionIdsChanged;

@@ -111,6 +119,21 @@ namespace BetterLyrics.WinUI3.ViewModels
            MediaSourceProvidersInfo = [.. e.MediaSourceProviersInfo];
        }

+        [ObservableProperty]
+        public partial bool IsDragEverywhereEnabled { get; set; }
+
+        [ObservableProperty]
+        [NotifyPropertyChangedRecipients]
+        public partial string LyricsFontFamily { get; set; }
+
+
+        [ObservableProperty]
+        public partial ObservableCollection<string> SystemFontNames { get; set; }
+
+        [ObservableProperty]
+        [NotifyPropertyChangedRecipients]
+        public partial int SelectedFontFamilyIndex { get; set; }
+
        [ObservableProperty]
        [NotifyPropertyChangedRecipients]
        public partial DockPlacement DockPlacement { get; set; }
@@ -294,6 +317,14 @@ namespace BetterLyrics.WinUI3.ViewModels
        [NotifyPropertyChangedRecipients]
        public partial string LXMusicServer { get; set; }

+        [ObservableProperty]
+        [NotifyPropertyChangedRecipients]
+        public partial bool HideWindowWhenNotPlaying { get; set; }
+
+        [ObservableProperty]
+        [NotifyPropertyChangedRecipients]
+        public partial int DockWindowHeight { get; set; }
+
        public void OnLyricsSearchProvidersReordered()
        {
            _settingsService.LyricsSearchProvidersInfo = [.. LyricsSearchProvidersInfo];
@@ -670,5 +701,32 @@ namespace BetterLyrics.WinUI3.ViewModels
        {
            _settingsService.LyricsBgFontOpacity = value;
        }
+        partial void OnHideWindowWhenNotPlayingChanged(bool value)
+        {
+            _settingsService.HideWindowWhenNotPlaying = value;
+        }
+        partial void OnDockWindowHeightChanged(int value)
+        {
+            _settingsService.DockWindowHeight = value;
+        }
+        partial void OnSelectedFontFamilyIndexChanged(int value)
+        {
+            _settingsService.SelectedFontFamilyIndex = value;
+            LyricsFontFamily = SystemFontNames[value];
+        }
+        partial void OnLyricsFontFamilyChanged(string value)
+        {
+            _settingsService.LyricsFontFamily = value;
+        }
+        partial void OnIsDragEverywhereEnabledChanged(bool value)
+        {
+            _settingsService.IsDragEverywhereEnabled = value;
+
+            LyricsWindow? lyricsWindow = WindowHelper.GetWindowByWindowType<LyricsWindow>();
+            if (lyricsWindow != null)
+            {
+                lyricsWindow.UpdateTitleBarArea();
+            }
+        }
    }
 }
--- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Views/LyricsPage.xaml
+++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Views/LyricsPage.xaml
@@ -28,7 +28,8 @@
                x:Uid="MainPageNoMusicPlaying"
                HorizontalAlignment="Center"
                VerticalAlignment="Center"
-                Style="{StaticResource TitleTextBlockStyle}" />
+                FontFamily="{x:Bind ViewModel.LyricsFontFamily, Mode=OneWay}"
+                FontSize="{x:Bind ViewModel.LyricsFontSize, Mode=OneWay}" />
            <Grid.OpacityTransition>
                <ScalarTransition />
            </Grid.OpacityTransition>
@@ -45,6 +46,18 @@
                    Value="{x:Null}">
                    <interactivity:ChangePropertyAction PropertyName="Opacity" Value="0" />
                </interactivity:DataTriggerBehavior>
+                <interactivity:DataTriggerBehavior
+                    Binding="{Binding ElementName=RootGrid, Path=ActualHeight, Mode=OneWay}"
+                    ComparisonCondition="LessThanOrEqual"
+                    Value="1">
+                    <interactivity:ChangePropertyAction PropertyName="Visibility" Value="Collapsed" />
+                </interactivity:DataTriggerBehavior>
+                <interactivity:DataTriggerBehavior
+                    Binding="{Binding ElementName=RootGrid, Path=ActualHeight, Mode=OneWay}"
+                    ComparisonCondition="GreaterThan"
+                    Value="1">
+                    <interactivity:ChangePropertyAction PropertyName="Visibility" Value="Visible" />
+                </interactivity:DataTriggerBehavior>
            </interactivity:Interaction.Behaviors>
        </Grid>

@@ -145,6 +158,25 @@
                <Grid.TranslationTransition>
                    <Vector3Transition />
                </Grid.TranslationTransition>
+                <Grid Background="{ThemeResource SolidBackgroundFillColorBaseBrush}">
+                    <Grid.OpacityTransition>
+                        <ScalarTransition />
+                    </Grid.OpacityTransition>
+                    <interactivity:Interaction.Behaviors>
+                        <interactivity:DataTriggerBehavior
+                            Binding="{x:Bind ViewModel.BottomCommandGridMargin.Bottom, Mode=OneWay}"
+                            ComparisonCondition="Equal"
+                            Value="0">
+                            <interactivity:ChangePropertyAction PropertyName="Opacity" Value="1" />
+                        </interactivity:DataTriggerBehavior>
+                        <interactivity:DataTriggerBehavior
+                            Binding="{x:Bind ViewModel.BottomCommandGridMargin.Bottom, Mode=OneWay}"
+                            ComparisonCondition="NotEqual"
+                            Value="0">
+                            <interactivity:ChangePropertyAction PropertyName="Opacity" Value="0" />
+                        </interactivity:DataTriggerBehavior>
+                    </interactivity:Interaction.Behaviors>
+                </Grid>
                <StackPanel
                    x:Name="BottomCenterCommandStackPanel"
                    Orientation="Horizontal"
@@ -205,14 +237,15 @@
            <Grid
                Padding="3"
                HorizontalAlignment="Right"
-                Style="{StaticResource CardGridStyle}">
+                Style="{StaticResource CardGridStyle}"
+                Translation="{x:Bind ViewModel.BottomRightCommandGridTranslation, Mode=OneWay}">
+                <Grid.TranslationTransition>
+                    <Vector3Transition />
+                </Grid.TranslationTransition>
                <StackPanel
                    x:Name="BottomRightCommandStackPanel"
                    Orientation="Horizontal"
                    Spacing="3">
-                    <StackPanel.OpacityTransition>
-                        <ScalarTransition />
-                    </StackPanel.OpacityTransition>

                    <!--  Position offset  -->
                    <Button Click="TimelineOffsetButton_Click" Style="{StaticResource GhostButtonStyle}">
--- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Views/LyricsPage.xaml.cs
+++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Views/LyricsPage.xaml.cs
@@ -93,6 +93,25 @@ namespace BetterLyrics.WinUI3.Views
            {
                ViewModel.BottomCenterCommandGridTranslation = new System.Numerics.Vector3(0, 0, 0);
            }
+
+            if (e.NewSize.Height < 80)
+            {
+                ViewModel.BottomRightCommandGridTranslation = new System.Numerics.Vector3(-200, 0, 0);
+            }
+            else
+            {
+                ViewModel.BottomRightCommandGridTranslation = new System.Numerics.Vector3(0, 0, 0);
+            }
+
+            if (e.NewSize.Height < 100)
+            {
+                ViewModel.BottomCommandGridMargin = new Thickness(0);
+            }
+            else
+            {
+                ViewModel.BottomCommandGridMargin = new Thickness(12);
+            }
+
        }
    }
 }
--- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Views/LyricsWindow.xaml.cs
+++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Views/LyricsWindow.xaml.cs
@@ -33,13 +33,25 @@ namespace BetterLyrics.WinUI3.Views
            ExtendsContentIntoTitleBar = true;
            AppWindow.TitleBar.PreferredHeightOption = TitleBarHeightOption.Collapsed;
            Title = App.ResourceLoader!.GetString("LyricsPageTitle");
-            SetTitleBar(TopCommandGrid);
-            //SetTitleBar(RootGrid);
+
+            UpdateTitleBarArea();

            _wmm = new WindowMessageMonitor(this);
            _wmm.WindowMessageReceived += Wmm_WindowMessageReceived;
        }

+        public void UpdateTitleBarArea()
+        {
+            if (_settingsService.IsDragEverywhereEnabled)
+            {
+                SetTitleBar(RootGrid);
+            }
+            else
+            {
+                SetTitleBar(TopCommandGrid);
+            }
+        }
+
        private void Wmm_WindowMessageReceived(object? sender, WindowMessageEventArgs e)
        {
            if (e.Message.MessageId == (uint)User32.WindowMessage.WM_HOTKEY)
@@ -157,8 +169,6 @@ namespace BetterLyrics.WinUI3.Views

        private void UpdateTitleBarWindowButtonsVisibility()
        {
-            TopCommandGrid.Margin = new Thickness(12);
-
            switch (AppWindow.Presenter.Kind)
            {
                case AppWindowPresenterKind.Default:
@@ -197,7 +207,6 @@ namespace BetterLyrics.WinUI3.Views
                            Visibility.Collapsed;

                        ViewModel.IsImmersiveMode = true;
-                        TopCommandGrid.Margin = new Thickness();
                    }
                    else if (DesktopFlyoutItem.IsChecked)
                    {
@@ -310,18 +319,14 @@ namespace BetterLyrics.WinUI3.Views

        private void RootGrid_SizeChanged(object sender, SizeChangedEventArgs e)
        {
-            if (ClickThroughButton == null) return;
-
-            // <20><>ȡ<EFBFBD><C8A1><EFBFBD>ؼ<EFBFBD><D8BC>ڴ<EFBFBD><DAB4><EFBFBD><EFBFBD>е<EFBFBD>λ<EFBFBD>ã<EFBFBD><C3A3><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ڴ<EFBFBD><DAB4><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Ͻǣ<CFBD>
-            var transform = ClickThroughButton.TransformToVisual(Content);
-            var point = transform.TransformPoint(new Windows.Foundation.Point(0, 0));
-            var btnRect = new Rectangle(
-                (int)point.X,
-                (int)point.Y,
-                (int)ClickThroughButton.ActualWidth,
-                (int)ClickThroughButton.ActualHeight
-            );
-            DesktopModeHelper.SetInteractiveRects([btnRect]);
+            if (e.NewSize.Height < 100)
+            {
+                TopCommandGrid.Margin = new Thickness(0);
+            }
+            else
+            {
+                TopCommandGrid.Margin = new Thickness(12);
+            }
        }
    }
 }
--- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Views/SettingsPage.xaml
+++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Views/SettingsPage.xaml
@@ -138,6 +138,14 @@
                                    <ToggleSwitch IsOn="{x:Bind ViewModel.IgnoreFullscreenWindow, Mode=TwoWay}" />
                                </controls:SettingsCard>

+                                <controls:SettingsCard x:Uid="SettingsPageHideWindow" HeaderIcon="{ui:FontIcon FontFamily={StaticResource IconFontFamily}, Glyph=&#xED1A;}">
+                                    <ToggleSwitch IsOn="{x:Bind ViewModel.HideWindowWhenNotPlaying, Mode=TwoWay}" />
+                                </controls:SettingsCard>
+
+                                <controls:SettingsCard x:Uid="SettingsPageGlobalDrag" HeaderIcon="{ui:FontIcon FontFamily={StaticResource IconFontFamily}, Glyph=&#xE7C2;}">
+                                    <ToggleSwitch IsOn="{x:Bind ViewModel.IsDragEverywhereEnabled, Mode=TwoWay}" />
+                                </controls:SettingsCard>
+
                                <!--  Desktop mode  -->

                                <TextBlock x:Uid="SettingsPageAppDesktop" Style="{StaticResource SettingsSectionHeaderTextBlockStyle}" />
@@ -183,6 +191,25 @@
                                    </StackPanel>
                                </controls:SettingsCard>

+                                <controls:SettingsCard x:Uid="SettingsPageDockWindowHeight" HeaderIcon="{ui:FontIcon FontFamily={StaticResource IconFontFamily}, Glyph=&#xED5E;}">
+                                    <StackPanel Orientation="Horizontal">
+                                        <TextBlock x:Uid="SettingsPageSliderPrefix" VerticalAlignment="Center" />
+                                        <TextBlock VerticalAlignment="Center" Text="{x:Bind ViewModel.DockWindowHeight, Mode=OneWay}" />
+                                        <TextBlock
+                                            Margin="0,0,14,0"
+                                            VerticalAlignment="Center"
+                                            Text=" px" />
+                                        <Slider
+                                            Maximum="200"
+                                            Minimum="64"
+                                            SnapsTo="Ticks"
+                                            StepFrequency="1"
+                                            TickFrequency="1"
+                                            TickPlacement="Outside"
+                                            Value="{x:Bind ViewModel.DockWindowHeight, Mode=TwoWay}" />
+                                    </StackPanel>
+                                </controls:SettingsCard>
+
                                <!--  Dock mode  -->

                                <TextBlock x:Uid="SettingsPageAppDock" Style="{StaticResource SettingsSectionHeaderTextBlockStyle}" />
@@ -484,6 +511,16 @@
                                    </ComboBox>
                                </controls:SettingsCard>

+                                <controls:SettingsCard x:Uid="SettingsPageLyricsFontFamily" HeaderIcon="{ui:FontIcon FontFamily={StaticResource IconFontFamily}, Glyph=&#xE8D2;}">
+                                    <ComboBox ItemsSource="{x:Bind ViewModel.SystemFontNames, Mode=OneWay}" SelectedIndex="{x:Bind ViewModel.SelectedFontFamilyIndex, Mode=TwoWay}">
+                                        <ComboBox.ItemTemplate>
+                                            <DataTemplate>
+                                                <TextBlock Text="{Binding}" />
+                                            </DataTemplate>
+                                        </ComboBox.ItemTemplate>
+                                    </ComboBox>
+                                </controls:SettingsCard>
+
                                <controls:SettingsCard x:Uid="SettingsPageLyricsFontWeight" HeaderIcon="{ui:FontIcon FontFamily={StaticResource IconFontFamily}, Glyph=&#xE8DD;}">
                                    <ComboBox SelectedIndex="{x:Bind ViewModel.LyricsFontWeight, Mode=TwoWay, Converter={StaticResource EnumToIntConverter}}">
                                        <ComboBoxItem x:Uid="SettingsPageLyricsThin" />
--- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Views/SettingsWindow.xaml
+++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Views/SettingsWindow.xaml
@@ -12,8 +12,6 @@
        <MicaBackdrop />
    </Window.SystemBackdrop>

-    <Grid>
-        <local:SettingsPage />
-    </Grid>
+    <local:SettingsPage />

 </Window>
--- a/README.CN.md
+++ b/README.CN.md
@@ -1,6 +1,8 @@
-<a href="https://github.com/jayfunc/BetterLyrics/blob/dev/README.md">_**Click here to see the English version**_</a>
+> 注：以下内容使用 https://claude.ai/ 依照英文原文翻译

-<a href="https://github.com/jayfunc/BetterLyrics/blob/dev/FAQ/FAQ.md">_**点此处查看常见问题与解答（FAQ）**_</a>
+<a href="https://github.com/jayfunc/BetterLyrics/blob/dev/README.md">_**🌐Click here to see the English version**_</a>
+
+<a href="https://github.com/jayfunc/BetterLyrics/blob/dev/FAQ/FAQ.md">_**❓点击查看常见问题（FAQ）**_</a>

 <div align="center">
  <img src="BetterLyrics.WinUI3/BetterLyrics.WinUI3/Assets/Logo.png" alt="" width="64"/>
@@ -9,143 +11,150 @@
 <h2 align="center">
 BetterLyrics
 </h2>
-
-<h3 align="center">
-基于 WinUI 3 打造的丝滑动态歌词显示工具
+<h4 align="center">
+基于 WinUI 3 构建的流畅动态歌词显示工具
 </h3>

---
+## 🎉 本项目已获得少数派推荐！
+查看文章：[BetterLyrics – 专为 Windows 设计的沉浸式流畅歌词显示工具](https://sspai.com/post/101028)

- [「BetterLyrics」反馈交流群（简体中文）](https://qun.qq.com/universal-share/share?ac=1&authKey=4Q%2BYTq3wZldYpF5SbS5c19ECFsiYoLZFAIcBNNzYpBUtiEjaZ8sZ%2F%2BnFN0qw3lad&busi_data=eyJncm91cENvZGUiOiIxMDU0NzAwMzg4IiwidG9rZW4iOiJiVnhqemVYN0N5QVc3b1ZkR24wWmZOTUtvUkJoWm1JRWlaWW5iZnlBcXJtZUtGc2FFTHNlUlFZMi9iRm03cWF5IiwidWluIjoiMTM5NTczOTY2MCJ9&data=39UmAihyH_o6CZaOs7nk2mO_lz2ruODoDou6pxxh7utcxP4WF5sbDBDOPvZ_Wqfzeey4441anegsLYQJxkrBAA&svctype=4&tempid=h5_group_info) (QQ群号：1054700388)
- [「BetterLyrics」反馈交流群（繁体中文/英文）](https://discord.gg/5yAQPnyCKv) (Discord)
+## 反馈交流群

---
+- [「BetterLyrics」反馈交流群（简体中文）](https://qun.qq.com/universal-share/share?ac=1&authKey=4Q%2BYTq3wZldYpF5SbS5c19ECFsiYoLZFAIcBNNzYpBUtiEjaZ8sZ%2F%2BnFN0qw3lad&busi_data=eyJncm91cENvZGUiOiIxMDU0NzAwMzg4IiwidG9rZW4iOiJiVnhqemVYN0N5QVc3b1ZkR24wWmZOTUtvUkJoWm1JRWlaWW5iZnlBcXJtZUtGc2FFTHNlUlFZMi9iRm03cWF5IiwidWluIjoiMTM5NTczOTY2MCJ9&data=39UmAihyH_o6CZaOs7nk2mO_lz2ruODoDou6pxxh7utcxP4WF5sbDBDOPvZ_Wqfzeey4441anegsLYQJxkrBAA&svctype=4&tempid=h5_group_info) (1054700388) QQ群
+- [「BetterLyrics」反馈交流群（繁体中文/英语）](https://discord.gg/5yAQPnyCKv) Discord服务器

-🎉 本项目已被少数派精选推荐！欢迎阅读：[BetterLyrics - 一款专为 Windows 打造的沉浸式流畅歌词显示软件](https://sspai.com/post/101028)
+## 核心特色功能

---
+- 动态模糊专辑封面作为背景
+- 流畅的歌词淡入淡出、缩放效果
+- 切换歌曲时界面平滑过渡
+- 逐字渐变卡拉OK效果（带光晕）
+- 沉浸式桌面歌词（悬浮模式）
+- 本地翻译（支持30种语言）

-## 核心特色
-
- 动态模糊专辑封面背景
- 丝滑的歌词淡入/淡出、缩放效果
- 歌曲切换时的流畅界面过渡
- 逐字渐变的卡拉OK效果（带光晕）
- 沉浸式桌面歌词（停靠模式）
- 本地化歌词翻译（支持 30 种语言）
-
-> 项目仍在开发中，最新分支可能存在未修复的 Bug 或异常行为
+> 本项目仍在开发中，最新版本可能存在bug和意外行为。

 ## 支持的歌词来源

- 本地资源
+- 本地存储
  - 音乐文件（内嵌歌词）
-  - [.lrc](<https://en.wikipedia.org/wiki/LRC_(file_format)>) 文件（标准格式与增强格式）
+  - [.lrc](<https://en.wikipedia.org/wiki/LRC_(file_format)>) 文件（支持标准格式和增强格式）
  - [.eslrc](https://github.com/ESLyric/release) 文件
  - [.ttml](https://en.wikipedia.org/wiki/Timed_Text_Markup_Language) 文件

-（歌词下载推荐工具：[LDDC](https://github.com/chenmozhijin/LDDC)）
+（如需下载歌词，可使用 [LDDC](https://github.com/chenmozhijin/LDDC)）

- 在线歌词源
+- 在线歌词提供商
  - QQ音乐
  - 网易云音乐
  - 酷狗音乐
  - [amll-ttml-db](https://github.com/Steve-xmh/amll-ttml-db)
  - [LRCLIB](https://lrclib.net/)

-## 效果展示
+## 应用截图

 ### 标准模式

-![标准模式](Screenshots/image.png)
+![alt text](Screenshots/image.png)

-![光晕浮动效果](Screenshots/glow-float.gif)
+![alt text](Screenshots/glow-float.gif)

-![歌词面板](Screenshots/fan.png)
+![alt text](Screenshots/fan.png)

-![纯歌词模式](Screenshots/lyrics-only.png)
+![alt text](Screenshots/lyrics-only.png)

-![纯专辑封面模式](Screenshots/album-art-only.png)
+![alt text](Screenshots/album-art-only.png)

-### 停靠模式
+### 悬浮模式

-![停靠模式1](Screenshots/dock-1.png)
+![alt text](Screenshots/dock-1.png)

-![停靠模式2](Screenshots/dock-2.png)
+![alt text](Screenshots/dock-2.png)

 ### 桌面模式

-![桌面模式1](Screenshots/desktop-1.png)
+![alt text](Screenshots/desktop-1.png)

-![桌面模式2](Screenshots/desktop-2.png)
+![alt text](Screenshots/desktop-2.png)

 ## 演示视频

-观看 B 站演示视频（2025年7月7日发布）[点击此处](https://www.bilibili.com/video/BV1zjGjzfEXh)
+观看我们的介绍视频（2025年7月7日上传）：[B站链接](https://www.bilibili.com/video/BV1zjGjzfEXh)

-## 立即体验
-
- 稳定版
-
-<a href="https://apps.microsoft.com/detail/9P1WCD1P597R?referrer=appbadge&mode=direct">
-	<img src="https://get.microsoft.com/images/zh-cn%20dark.svg" width="200"/>
-</a>
-
-> **最便捷**的获取方式，提供**无限制**免费试用或购买（免费版与付费版**功能完全一致**，购买视为对开发者的支持）
-
-或通过 Google Drive 获取（链接见[发布页](https://github.com/jayfunc/BetterLyrics/releases)）
-
-> 下载的是 ".zip" 压缩包，安装指南请参阅[此文档](How2Install/How2Install.md)
-
- 开发版
-可通过 `git clone` 拉取项目源码自行编译
-
-## 已测试播放器
+## 已测试的音乐播放器

+- 网易云音乐
+  - 请先安装 [BetterNCM 插件](https://microblock.cc/betterncm) 安装完成后如若弹出降级指引，请根据指引完成网易云音乐的降级操作（降级至 2.10.13）；
+  - 之后请在 PluginMarket 内安装 InfLink 插件，安装完成后请重启网易云音乐。至此，所有预备操作均已完成，尽情享用吧！
 - 酷狗音乐
-  - **时间轴同步限制**：酷狗不广播时间轴信息，调整进度时歌词无法实时跟随
+  - 不会广播时间线信息，这意味着当您在酷狗音乐中更改播放进度时，BetterLyrics无法检测到此更改。
 - Apple Music
-  - 需在设置中调整时间轴阈值至 600 ms 左右（路径：设置→高级选项）
+  - 确保您在设置中将时间线阈值设置为约600毫秒（进入"设置"-"高级选项"进行更改），否则歌词会不断前后跳动。
 - foobar2000
-  - 需配合安装 [foo_mediacontrol](https://github.com/dumbie/foo_mediacontrol) 插件
+  - 确保您安装了 https://github.com/dumbie/foo_mediacontrol 插件
 - Spotify
 - QQ音乐
 - PotPlayer
- 系统自带媒体播放器
+- 媒体播放器（系统自带）
+- LX 音乐
+  - 请确保您已在 LX 音乐设置页面启用“开放 API”
+  - 然后打开 BetterLyrics，进入设置，点击“高级选项”，输入您的 LX 音乐服务器地址（例如 http://127.0.0.1:23330）即可
+- MusicBee
+  - 使用前请安装 https://github.com/HenryPDT/mb_MediaControl

-## 鸣谢
+## 立即下载体验
+
+### Microsoft Store
+
+<a href="https://apps.microsoft.com/detail/9P1WCD1P597R?referrer=appbadge&mode=direct">
+	<img src="https://get.microsoft.com/images/en-us%20dark.svg" width="200"/>
+</a>
+
+**最简单**的获取方式，**无限制**免费试用或购买（免费版与付费版**功能完全相同**）
+
+☕ 如果您觉得有用，请考虑在**Microsoft Store**中购买支持🧧，我会非常感激的！🥰
+
+> 请注意，Microsoft Store中的版本可能不是最新版本。
+
+### Google Drive
+
+想要体验**最新**版本？从Google Drive获取（请查看[发布页面](https://github.com/jayfunc/BetterLyrics/releases)获取链接）
+
+> 请注意您下载的是".zip"文件，安装指南请参考[此文档](How2Install/How2Install.md)。
+
+## 特别感谢

 - [Lyricify-Lyrics-Helper](https://github.com/WXRIW/Lyricify-Lyrics-Helper)
-  - 提供 QQ/网易云/酷狗歌词获取与解密
+  - 提供QQ、网易、酷狗音源的歌词获取、解密和解析
 - [LRCLIB](https://lrclib.net/)
-  - 歌词 API 服务
- [ATL.NET](https://github.com/Zeugma440/atldotnet)
-  - 音乐文件封面提取
+  - LRCLIB歌词API提供商
+- [Audio Tools Library (ATL) for .NET](https://github.com/Zeugma440/atldotnet)
+  - 用于提取音乐文件中的图片
 - [WinUIEx](https://github.com/dotMorten/WinUIEx)
-  - Win32 窗口 API 封装
+  - 提供便捷的Win32 API窗口操作方式
 - [TagLib#](https://github.com/mono/taglib-sharp)
-  - 歌词内容解析
+  - 用于读取原始歌词内容
 - [Vanara](https://github.com/dahall/Vanara)
-  - Win32 API 封装库
- [Stackoverflow - WPF边距动画实现](https://stackoverflow.com/a/21542882/11048731)
+  - Win32 API包装器
+- [Stackoverflow - How to animate Margin property in WPF](https://stackoverflow.com/a/21542882/11048731)
 - [DevWinUI](https://github.com/ghost1372/DevWinUI)
- [B站 - WinUI3系统背景效果教程](https://www.bilibili.com/video/BV1PY4FevEkS)
- [博客园 - .NET应用与SMTC交互](https://www.cnblogs.com/TwilightLemon/p/18279496)
- [Win2D游戏循环实现](https://www.cnblogs.com/walterlv/p/10236395.html)
- [Win2D高级示例](https://github.com/r2d2rigo/Win2D-Samples)
- [CommunityToolkit开发指南](https://mvvm.coldwind.top/)
+- [Bilibili -【WinUI3】SystemBackdropController：定义云母、亚克力效果](https://www.bilibili.com/video/BV1PY4FevEkS)
+- [cnblogs - .NET App 与 Windows 系统媒体控制(SMTC)交互](https://www.cnblogs.com/TwilightLemon/p/18279496)
+- [Win2D 中的游戏循环：CanvasAnimatedControl](https://www.cnblogs.com/walterlv/p/10236395.html)
+- [r2d2rigo/Win2D-Samples](https://github.com/r2d2rigo/Win2D-Samples/blob/master/IrisBlurWin2D/IrisBlurWin2D/MainPage.xaml.cs)
+- [CommunityToolkit - 从入门到精通](https://mvvm.coldwind.top/)

-## 灵感来源
+## 设计灵感来源

- [网易云歌词增强](https://github.com/solstice23/refined-now-playing-netease)
+- [refined-now-playing-netease](https://github.com/solstice23/refined-now-playing-netease)
 - [Lyricify-App](https://github.com/WXRIW/Lyricify-App)
- [椒盐音乐播放器](https://moriafly.com/program/salt-player)
- [MyToolBar任务栏工具](https://github.com/TwilightLemon/MyToolBar)
+- [椒盐音乐 Salt Player](https://moriafly.com/program/salt-player)
+- [MyToolBar](https://github.com/TwilightLemon/MyToolBar)

-## 项目星标历史
+## Star 历史

 [![Star History Chart](https://api.star-history.com/svg?repos=jayfunc/BetterLyrics&type=Date)](https://www.star-history.com/#jayfunc/BetterLyrics&Date)

-## 欢迎反馈与贡献
+## 欢迎提交问题和拉取请求

-如遇问题请提交 Issue，如有改进建议欢迎提交 PR
+如果您发现bug，请在issues中提交；如果您有任何想法，也欢迎在这里分享。
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
-<a href="https://github.com/jayfunc/BetterLyrics/blob/dev/README.CN.md">_**点此处查看中文说明**_</a>
+<a href="https://github.com/jayfunc/BetterLyrics/blob/dev/README.CN.md">_**🌐点此处查看中文说明**_</a>

-<a href="https://github.com/jayfunc/BetterLyrics/blob/dev/FAQ/FAQ.md">_**Click here to view frequently asked questions (FAQ)**_</a>
+<a href="https://github.com/jayfunc/BetterLyrics/blob/dev/FAQ/FAQ.md">_**❓Click here to view frequently asked questions (FAQ)**_</a>

 <div align="center">
  <img src="BetterLyrics.WinUI3/BetterLyrics.WinUI3/Assets/Logo.png" alt="" width="64"/>
@@ -9,22 +9,18 @@
 <h2 align="center">
 BetterLyrics
 </h2>
-
-<h3 align="center">
+<h4 align="center">
 Your smooth dynamic lyrics display tool built with WinUI 3
 </h3>

---
+## 🎉 This project was featured by SSPAI!
+Check out the article: [BetterLyrics – An immersive and smooth lyrics display tool designed for Windows](https://sspai.com/post/101028)
+
+## Feedback and chat group

 - [「BetterLyrics」反馈交流群（简体中文）](https://qun.qq.com/universal-share/share?ac=1&authKey=4Q%2BYTq3wZldYpF5SbS5c19ECFsiYoLZFAIcBNNzYpBUtiEjaZ8sZ%2F%2BnFN0qw3lad&busi_data=eyJncm91cENvZGUiOiIxMDU0NzAwMzg4IiwidG9rZW4iOiJiVnhqemVYN0N5QVc3b1ZkR24wWmZOTUtvUkJoWm1JRWlaWW5iZnlBcXJtZUtGc2FFTHNlUlFZMi9iRm03cWF5IiwidWluIjoiMTM5NTczOTY2MCJ9&data=39UmAihyH_o6CZaOs7nk2mO_lz2ruODoDou6pxxh7utcxP4WF5sbDBDOPvZ_Wqfzeey4441anegsLYQJxkrBAA&svctype=4&tempid=h5_group_info) (1054700388) on QQ
 - [「BetterLyrics」Feedback Chat Group (Traditional Chinese / English)](https://discord.gg/5yAQPnyCKv) on Discord

---
-
-🎉 This project was featured by SSPAI! Check out the article: [BetterLyrics – An immersive and smooth lyrics display tool designed for Windows](https://sspai.com/post/101028)
-
---
-
 ## Highlighted features

 - Dynamic blur album art as background
@@ -83,26 +79,11 @@ Your smooth dynamic lyrics display tool built with WinUI 3

 Watch our introduction video (uploaded on 7 July 2025) on Bilibili [here](https://www.bilibili.com/video/BV1zjGjzfEXh).

-## Try it now
-
- Stable version
-
-<a href="https://apps.microsoft.com/detail/9P1WCD1P597R?referrer=appbadge&mode=direct">
-	<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, if you like you can purchase to support me)
-
-Or alternatively 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).
-
- Latest dev version
-
-You can `git clone` this project and build it yourself.
-
 ## Tested music player

+- NetEase Cloud Music
+  - Please install the [BetterNCM plugin](https://microblock.cc/betterncm) first. If a downgrade guide pops up after the installation, please follow the guide to complete the downgrade of NetEase Cloud Music (downgrade to 2.10.13);
+  - After that, please install the InfLink plugin in PluginMarket. After the installation is complete, please restart NetEase Cloud Music. At this point, all preparatory operations have been completed, enjoy it!
 - Kugou Music
  - No timeline information broadcasted, which means when you change timeline position in Kugou Music, BetterLyrics has no way to detect this change. 
 - Apple Music
@@ -113,6 +94,31 @@ You can `git clone` this project and build it yourself.
 - QQ Music
 - PotPlayer
 - Media Player (System)
+- LX Music
+  - Please make sure you have enabled "Open API" in LX Music settings page
+  - Then open BetterLyrics, go to settings, go to "Advanced options", input your LX Music server address (mostly like http://127.0.0.1:23330) and there you go!
+- MusicBee
+  - Please install https://github.com/HenryPDT/mb_MediaControl before using
+
+## Try it now
+
+### Microsoft Store
+
+<a href="https://apps.microsoft.com/detail/9P1WCD1P597R?referrer=appbadge&mode=direct">
+	<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)
+
+☕ If you find it helpful, please consider purchasing 🧧 it in **Microsoft Store**, I'll appreciate it! 🥰
+
+> Please note that the version in Microsoft Store may not be the latest.
+
+### Google Drive
+
+Wanna try the **latest** version? 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).

 ## Many thanks to

--- a/image.png
+++ b/image.png