fix: issue related with docked mode

chore: update version code
chores: move window color sampling settings item to general tab, remove useless debug writeline
2026-01-13 03:34:55 +08:00 · 2025-10-22 10:52:57 -04:00 · 2025-10-22 10:31:14 -04:00 · 2025-10-22 10:23:50 -04:00 · 2025-10-22 10:18:49 -04:00 · 2025-10-22 09:24:16 -04:00
12 changed files with 149 additions and 137 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.82.0" />
+	  Version="1.0.83.0" />

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

--- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Controls/LyricsWindowSettingsControl.xaml
+++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Controls/LyricsWindowSettingsControl.xaml
@@ -137,6 +137,24 @@
                                    </controls:SettingsExpander.Items>
                                </controls:SettingsExpander>

+                                <controls:SettingsExpander
+                                    x:Uid="SettingsPageAdaptEnvColor"
+                                    HeaderIcon="{ui:FontIcon FontFamily={StaticResource IconFontFamily},
+                                                             Glyph=&#xE88F;}"
+                                    IsExpanded="{x:Bind ViewModel.LiveStates.LyricsWindowStatus.IsAdaptToEnvironment, Mode=OneWay}">
+                                    <ToggleSwitch IsOn="{x:Bind ViewModel.LiveStates.LyricsWindowStatus.IsAdaptToEnvironment, Mode=TwoWay}" />
+                                    <controls:SettingsExpander.Items>
+                                        <controls:SettingsCard x:Uid="SettingsPageEnvColorSample" Header="Environment color sample mode">
+                                            <ComboBox SelectedIndex="{x:Bind ViewModel.LiveStates.LyricsWindowStatus.EnvironmentSampleMode, Mode=TwoWay, Converter={StaticResource EnumToIntConverter}}">
+                                                <ComboBoxItem x:Uid="SettingsPageEnvColorSampleBelow" />
+                                                <ComboBoxItem x:Uid="SettingsPageEnvColorSampleAbove" />
+                                                <ComboBoxItem x:Uid="SettingsPageEnvColorSampleInner" />
+                                                <ComboBoxItem x:Uid="SettingsPageEnvColorSampleEdge" />
+                                            </ComboBox>
+                                        </controls:SettingsCard>
+                                    </controls:SettingsExpander.Items>
+                                </controls:SettingsExpander>
+
                                <controls:SettingsCard x:Uid="SettingsPageDockMonitor" HeaderIcon="{ui:FontIcon FontFamily={StaticResource IconFontFamily}, Glyph=&#xE7F4;}">
                                    <StackPanel Orientation="Horizontal" Spacing="6">
                                        <ComboBox ItemsSource="{x:Bind ViewModel.MonitorDeviceNames, Mode=OneWay}" SelectedItem="{x:Bind ViewModel.LiveStates.LyricsWindowStatus.MonitorDeviceName, Mode=TwoWay}" />
@@ -275,24 +293,6 @@
                                    <ToggleSwitch IsOn="{x:Bind ViewModel.LiveStates.LyricsWindowStatus.IsBorderless, Mode=TwoWay}" />
                                </controls:SettingsCard>

-                                <controls:SettingsExpander
-                                    x:Uid="SettingsPageAdaptEnvColor"
-                                    HeaderIcon="{ui:FontIcon FontFamily={StaticResource IconFontFamily},
-                                                             Glyph=&#xE88F;}"
-                                    IsExpanded="{x:Bind ViewModel.LiveStates.LyricsWindowStatus.IsAdaptToEnvironment, Mode=OneWay}">
-                                    <ToggleSwitch IsOn="{x:Bind ViewModel.LiveStates.LyricsWindowStatus.IsAdaptToEnvironment, Mode=TwoWay}" />
-                                    <controls:SettingsExpander.Items>
-                                        <controls:SettingsCard x:Uid="SettingsPageEnvColorSample" Header="Environment color sample mode">
-                                            <ComboBox SelectedIndex="{x:Bind ViewModel.LiveStates.LyricsWindowStatus.EnvironmentSampleMode, Mode=TwoWay, Converter={StaticResource EnumToIntConverter}}">
-                                                <ComboBoxItem x:Uid="SettingsPageEnvColorSampleBelow" />
-                                                <ComboBoxItem x:Uid="SettingsPageEnvColorSampleAbove" />
-                                                <ComboBoxItem x:Uid="SettingsPageEnvColorSampleInner" />
-                                                <ComboBoxItem x:Uid="SettingsPageEnvColorSampleEdge" />
-                                            </ComboBox>
-                                        </controls:SettingsCard>
-                                    </controls:SettingsExpander.Items>
-                                </controls:SettingsExpander>
-
                                <controls:SettingsCard x:Uid="SettingsPageDragArea" HeaderIcon="{ui:FontIcon FontFamily={StaticResource IconFontFamily}, Glyph=&#xEB41;}">
                                    <ComboBox SelectedIndex="{x:Bind ViewModel.LiveStates.LyricsWindowStatus.TitleBarArea, Mode=TwoWay, Converter={StaticResource EnumToIntConverter}}">
                                        <ComboBoxItem x:Uid="SettingsPageTitleBarAreaNone" />
--- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Helper/ColorHelper.cs
+++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Helper/ColorHelper.cs
@@ -131,7 +131,7 @@ namespace BetterLyrics.WinUI3.Helper
                    }
                case WindowPixelSampleMode.AboveWindow:
                    {
-                        return GetAverageColorFromScreenRegion(myRect.Left, myRect.Top - 3, screenWidth, 1);
+                        return GetAverageColorFromScreenRegion(myRect.Left, myRect.Top - 2, screenWidth, 1);
                    }
                case WindowPixelSampleMode.WindowArea:
                    {
@@ -149,49 +149,21 @@ namespace BetterLyrics.WinUI3.Helper
                        if (width <= 0 || height <= 0)
                            return System.Drawing.Color.Transparent;

-                        var edgeThickness = new Thickness(36, 0, 36, 0);
+                        var edgeThickness = new Thickness(36, 36, 36, 36);
                        List<System.Drawing.Color> edgeColors = [];

                        // Top edge
-                        if (edgeThickness.Top > 0 && edgeThickness.Top < height)
-                            edgeColors.Add(
-                                GetAverageColorFromScreenRegion(
-                                    myRect.Left,
-                                    myRect.Top,
-                                    width,
-                                    (int)edgeThickness.Top
-                                )
-                            );
+                        if (edgeThickness.Top > 0)
+                            edgeColors.Add(GetAverageColorFromScreenRegion(myRect.Left, myRect.Top - (int)edgeThickness.Top, width, (int)edgeThickness.Top));
                        // Bottom edge
-                        if (edgeThickness.Bottom > 0 && edgeThickness.Bottom < height)
-                            edgeColors.Add(
-                                GetAverageColorFromScreenRegion(
-                                    myRect.Left,
-                                    myRect.Bottom - (int)edgeThickness.Bottom,
-                                    width,
-                                    (int)edgeThickness.Bottom
-                                )
-                            );
+                        if (edgeThickness.Bottom > 0)
+                            edgeColors.Add(GetAverageColorFromScreenRegion(myRect.Left, myRect.Bottom, width, (int)edgeThickness.Bottom));
                        // Left edge
-                        if (edgeThickness.Left > 0 && edgeThickness.Left < width)
-                            edgeColors.Add(
-                                GetAverageColorFromScreenRegion(
-                                    myRect.Left,
-                                    myRect.Top + (int)edgeThickness.Top,
-                                    (int)edgeThickness.Left,
-                                    height - (int)edgeThickness.Top - (int)edgeThickness.Bottom
-                                )
-                            );
+                        if (edgeThickness.Left > 0)
+                            edgeColors.Add(GetAverageColorFromScreenRegion(myRect.Left - (int)edgeThickness.Left, myRect.Top, (int)edgeThickness.Left, height));
                        // Right edge
-                        if (edgeThickness.Right > 0 && edgeThickness.Right < width)
-                            edgeColors.Add(
-                                GetAverageColorFromScreenRegion(
-                                    myRect.Right - (int)edgeThickness.Right,
-                                    myRect.Top + (int)edgeThickness.Top,
-                                    (int)edgeThickness.Right,
-                                    height - (int)edgeThickness.Top - (int)edgeThickness.Bottom
-                                )
-                            );
+                        if (edgeThickness.Right > 0)
+                            edgeColors.Add(GetAverageColorFromScreenRegion(myRect.Right, myRect.Top, (int)edgeThickness.Right, height));

                        // 合并四边平均色
                        if (edgeColors.Count == 0)
--- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Helper/LyricsParser.cs
+++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Helper/LyricsParser.cs
@@ -4,6 +4,7 @@ using BetterLyrics.WinUI3.Enums;
 using BetterLyrics.WinUI3.Models;
 using BetterLyrics.WinUI3.Services;
 using Lyricify.Lyrics.Models;
+using Lyricify.Lyrics.Parsers;
 using System;
 using System.Collections.Generic;
 using System.Linq;
@@ -13,7 +14,7 @@ using LyricsData = BetterLyrics.WinUI3.Models.LyricsData;

 namespace BetterLyrics.WinUI3.Helper
 {
-    public class LyricsParser
+    public partial class LyricsParser
    {
        private List<LyricsData> _lyricsDataArr = [];

@@ -34,10 +35,10 @@ namespace BetterLyrics.WinUI3.Helper
                        ParseLrc(raw);
                        break;
                    case LyricsFormat.Qrc:
-                        ParseQQNeteaseKugou(Lyricify.Lyrics.Parsers.QrcParser.Parse(raw).Lines);
+                        ParseQQNeteaseKugou(QrcParser.Parse(raw).Lines);
                        break;
                    case LyricsFormat.Krc:
-                        ParseQQNeteaseKugou(Lyricify.Lyrics.Parsers.KrcParser.Parse(raw).Lines);
+                        ParseQQNeteaseKugou(KrcParser.Parse(raw).Lines);
                        break;
                    case LyricsFormat.Ttml:
                        ParseTtml(raw);
@@ -121,9 +122,7 @@ namespace BetterLyrics.WinUI3.Helper
                new List<(int time, string text, List<(int time, string text)> syllables)>();

            // 支持 [mm:ss.xx]字、<mm:ss.xx>字，毫秒两位或三位
-            var syllableRegex = new Regex(
-                @"(\[|\<)(\d{2}):(\d{2})\.(\d{2,3})(\]|\>)([^\[\]\<\>]*)"
-            );
+            var syllableRegex = SyllableRegex();

            foreach (var line in lines)
            {
@@ -140,7 +139,7 @@ namespace BetterLyrics.WinUI3.Helper

                    syllables.Add((totalMs, text));
                }
-                if (syllables.Count > 0)
+                if (syllables.Count > 1)
                {
                    lrcLines.Add(
                        (
@@ -153,18 +152,19 @@ namespace BetterLyrics.WinUI3.Helper
                else
                {
                    // 普通LRC行
-                    var bracketRegex = new Regex(@"\[(\d{2}):(\d{2})\.(\d{2,3})\]");
+                    Regex? bracketRegex = LrcRegex();
                    var bracketMatches = bracketRegex.Matches(line);
+
                    string content = line;
                    int? lineStartTime = null;
                    if (bracketMatches.Count > 0)
                    {
-                        var m = bracketMatches[0];
+                        var m = bracketMatches![0];
                        int min = int.Parse(m.Groups[1].Value);
                        int sec = int.Parse(m.Groups[2].Value);
-                        int ms = int.Parse(m.Groups[3].Value.PadRight(3, '0'));
+                        int ms = int.Parse(m.Groups[4].Value.PadRight(3, '0'));
                        lineStartTime = min * 60_000 + sec * 1000 + ms;
-                        content = bracketRegex.Replace(line, "");
+                        content = bracketRegex!.Replace(line, "");
                        lrcLines.Add((lineStartTime.Value, content, new List<(int, string)>()));
                    }
                }
@@ -450,5 +450,10 @@ namespace BetterLyrics.WinUI3.Helper

            _lyricsDataArr.Add(new LyricsData(lyricsLines));
        }
+
+        [GeneratedRegex(@"\[(\d*):(\d*)(\.|\:)(\d*)\]")]
+        private static partial Regex LrcRegex();
+        [GeneratedRegex(@"(\[|\<)(\d*):(\d*)\.(\d*)(\]|\>)([^\[\]\<\>]*)")]
+        private static partial Regex SyllableRegex();
    }
 }
--- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Helper/PlayerIdMatcher.cs
+++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Helper/PlayerIdMatcher.cs
@@ -0,0 +1,25 @@
+using System.Collections.Generic;
+using System.Text.RegularExpressions;
+
+namespace BetterLyrics.WinUI3.Helper
+{
+    public static class PlayerIdMatcher
+    {
+        private static readonly List<string> _neteaseFamilyRegex =
+        [
+            "cloudmusic.exe", //NetEaseCloudMusic
+            "^17588BrandonWong\\.LyricEase_", //LyricEase
+            "^48848aaaaaaccd\\.HyPlayer_" //HyPlayer
+        ];
+
+        public static bool IsNeteaseFamily(string player)
+        {
+            foreach (var regex in _neteaseFamilyRegex)
+            {
+                var isMatch = Regex.IsMatch(player, regex);
+                if (isMatch) return true;
+            }
+            return false;
+        }
+    }
+}
--- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Helper/WindowHelper.cs
+++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Helper/WindowHelper.cs
@@ -286,22 +286,6 @@ namespace BetterLyrics.WinUI3.Helper
            if (_workAreas.Contains(hwnd)) return;

            RegisterWorkArea(hwnd);
-
-            double y = _liveStatesService.LiveStates.LyricsWindowStatus.DockPlacement == DockPlacement.Top ?
-                _liveStatesService.LiveStates.LyricsWindowStatus.MonitorBounds.Top :
-                _liveStatesService.LiveStates.LyricsWindowStatus.MonitorBounds.Bottom - _liveStatesService.LiveStates.LyricsWindowStatus.DockHeight;
-
-            y -= 1;
-
-            User32.SetWindowPos(
-                hwnd,
-                IntPtr.Zero,
-                (int)_liveStatesService.LiveStates.LyricsWindowStatus.MonitorBounds.Left,
-                (int)y,
-                (int)_liveStatesService.LiveStates.LyricsWindowStatus.MonitorBounds.Width,
-                (int)_liveStatesService.LiveStates.LyricsWindowStatus.DockHeight + 1,
-                User32.SetWindowPosFlags.SWP_SHOWWINDOW
-            );
        }

        private static void RegisterWorkArea(IntPtr hwnd)
@@ -350,55 +334,40 @@ namespace BetterLyrics.WinUI3.Helper
            _workAreas.Remove(hwnd);
        }

-        public static void UpdateWorkAreaHeight<T>()
+        public static void UpdateWorkArea<T>()
        {
            var window = GetWindowByWindowType<T>() as Window;
            if (window == null) return;

            var hwnd = WindowNative.GetWindowHandle(window);

-            App.DispatcherQueueTimer?.Debounce(() =>
+            if (!_workAreas.Contains(hwnd))
+                return;
+
+            var uEdge = _liveStatesService.LiveStates.LyricsWindowStatus.DockPlacement == DockPlacement.Top ? Shell32.ABE.ABE_TOP : Shell32.ABE.ABE_BOTTOM;
+
+            double top = _liveStatesService.LiveStates.LyricsWindowStatus.DockPlacement == DockPlacement.Top ?
+                _liveStatesService.LiveStates.LyricsWindowStatus.MonitorBounds.Top :
+                _liveStatesService.LiveStates.LyricsWindowStatus.MonitorBounds.Bottom - _liveStatesService.LiveStates.LyricsWindowStatus.DockHeight;
+
+            double bottom = top + _liveStatesService.LiveStates.LyricsWindowStatus.DockHeight;
+
+            Shell32.APPBARDATA abd = new()
            {
-                if (!_workAreas.Contains(hwnd))
-                    return;
-
-                var uEdge = _liveStatesService.LiveStates.LyricsWindowStatus.DockPlacement == DockPlacement.Top ? Shell32.ABE.ABE_TOP : Shell32.ABE.ABE_BOTTOM;
-
-                double top = _liveStatesService.LiveStates.LyricsWindowStatus.DockPlacement == DockPlacement.Top ?
-                    _liveStatesService.LiveStates.LyricsWindowStatus.MonitorBounds.Top :
-                    _liveStatesService.LiveStates.LyricsWindowStatus.MonitorBounds.Bottom - _liveStatesService.LiveStates.LyricsWindowStatus.DockHeight;
-
-                double bottom = top + _liveStatesService.LiveStates.LyricsWindowStatus.DockHeight;
-
-                Shell32.APPBARDATA abd = new()
+                cbSize = (uint)Marshal.SizeOf<Shell32.APPBARDATA>(),
+                hWnd = hwnd,
+                uEdge = uEdge,
+                rc = new RECT
                {
-                    cbSize = (uint)Marshal.SizeOf<Shell32.APPBARDATA>(),
-                    hWnd = hwnd,
-                    uEdge = uEdge,
-                    rc = new RECT
-                    {
-                        Left = (int)_liveStatesService.LiveStates.LyricsWindowStatus.MonitorBounds.Left,
-                        Top = (int)top,
-                        Right = (int)_liveStatesService.LiveStates.LyricsWindowStatus.MonitorBounds.Right,
-                        Bottom = (int)bottom,
-                    },
-                };
+                    Left = (int)_liveStatesService.LiveStates.LyricsWindowStatus.MonitorBounds.Left,
+                    Top = (int)top,
+                    Right = (int)_liveStatesService.LiveStates.LyricsWindowStatus.MonitorBounds.Right,
+                    Bottom = (int)bottom,
+                },
+            };

-                Shell32.SHAppBarMessage(Shell32.ABM.ABM_QUERYPOS, ref abd);
-                Shell32.SHAppBarMessage(Shell32.ABM.ABM_SETPOS, ref abd);
-
-                // 同步窗口实际高度和位置
-                User32.SetWindowPos(
-                     hwnd,
-                     IntPtr.Zero,
-                     (int)_liveStatesService.LiveStates.LyricsWindowStatus.MonitorBounds.Left,
-                     (int)top - 1,
-                     (int)_liveStatesService.LiveStates.LyricsWindowStatus.MonitorBounds.Width,
-                     (int)_liveStatesService.LiveStates.LyricsWindowStatus.DockHeight + 1,
-                     User32.SetWindowPosFlags.SWP_SHOWWINDOW
-                 );
-
-            }, TimeSpan.FromMilliseconds(100));
+            Shell32.SHAppBarMessage(Shell32.ABM.ABM_QUERYPOS, ref abd);
+            Shell32.SHAppBarMessage(Shell32.ABM.ABM_SETPOS, ref abd);
        }

        public static void SetLyricsWindowVisibilityByPlayingStatus()
--- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Services/LiveStatesService/LiveStatesService.cs
+++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Services/LiveStatesService/LiveStatesService.cs
@@ -3,6 +3,7 @@ using BetterLyrics.WinUI3.Models;
 using BetterLyrics.WinUI3.Services.SettingsService;
 using BetterLyrics.WinUI3.ViewModels;
 using BetterLyrics.WinUI3.Views;
+using CommunityToolkit.WinUI.Controls;
 using System.Linq;

 namespace BetterLyrics.WinUI3.Services.LiveStatesService
@@ -33,11 +34,21 @@ namespace BetterLyrics.WinUI3.Services.LiveStatesService
        {
            switch (e.PropertyName)
            {
-                case nameof(LyricsWindowStatus.DockHeight):
                case nameof(LyricsWindowStatus.IsWorkArea):
+                    WindowHelper.SetIsWorkArea<LyricsWindow>(LiveStates.LyricsWindowStatus.IsWorkArea);
+                    if (LiveStates.LyricsWindowStatus.IsWorkArea)
+                    {
+                        UpdateWindowBoundsWhenWorkArea();
+                    }
+                    break;
+                case nameof(LyricsWindowStatus.DockHeight):
                case nameof(LyricsWindowStatus.DockPlacement):
                case nameof(LyricsWindowStatus.MonitorDeviceName):
-                    WindowHelper.UpdateWorkAreaHeight<LyricsWindow>();
+                    WindowHelper.UpdateWorkArea<LyricsWindow>();
+                    if (LiveStates.LyricsWindowStatus.IsWorkArea)
+                    {
+                        UpdateWindowBoundsWhenWorkArea();
+                    }
                    break;
                case nameof(LyricsWindowStatus.IsShownInSwitchers):
                    WindowHelper.SetIsShowInSwitchers<LyricsWindow>(LiveStates.LyricsWindowStatus.IsShownInSwitchers);
@@ -85,17 +96,43 @@ namespace BetterLyrics.WinUI3.Services.LiveStatesService

        public void RefreshLyricsWindowStatus()
        {
-            // Order matters!!!
            WindowHelper.SetIsWorkArea<LyricsWindow>(LiveStates.LyricsWindowStatus.IsWorkArea);
+
+            if (LiveStates.LyricsWindowStatus.IsWorkArea)
+            {
+                UpdateWindowBoundsWhenWorkArea();
+            }
+
+            WindowHelper.MoveAndResize<LyricsWindow>(LiveStates.LyricsWindowStatus.WindowBounds);
+            LiveStates.LyricsWindowStatus.UpdateMonitorNameAndBounds();
+            LiveStates.LyricsWindowStatus.UpdateDemoWindowAndMonitorBounds();
+
            WindowHelper.SetIsShowInSwitchers<LyricsWindow>(LiveStates.LyricsWindowStatus.IsShownInSwitchers);
            WindowHelper.SetIsAlwaysOnTop<LyricsWindow>(LiveStates.LyricsWindowStatus.IsAlwaysOnTop);
            WindowHelper.SetIsClickThrough<LyricsWindow>(LiveStates.LyricsWindowStatus.IsClickThrough);
            WindowHelper.SetIsBorderless<LyricsWindow>(LiveStates.LyricsWindowStatus.IsBorderless);
            WindowHelper.SetLyricsWindowVisibilityByPlayingStatus();
            WindowHelper.SetTitleBarArea<LyricsWindow>(LiveStates.LyricsWindowStatus.TitleBarArea);
-            WindowHelper.MoveAndResize<LyricsWindow>(LiveStates.LyricsWindowStatus.WindowBounds);
-            LiveStates.LyricsWindowStatus.UpdateMonitorNameAndBounds();
-            LiveStates.LyricsWindowStatus.UpdateDemoWindowAndMonitorBounds();
+        }
+
+        private void UpdateWindowBoundsWhenWorkArea()
+        {
+            LiveStates.LyricsWindowStatus.WindowBounds = new Windows.Foundation.Rect(
+                LiveStates.LyricsWindowStatus.MonitorBounds.X,
+                LiveStates.LyricsWindowStatus.DockPlacement switch
+                {
+                    Enums.DockPlacement.Top => LiveStates.LyricsWindowStatus.MonitorBounds.Top,
+                    Enums.DockPlacement.Bottom => LiveStates.LyricsWindowStatus.MonitorBounds.Bottom - LiveStates.LyricsWindowStatus.DockHeight - 1,
+                    _ => LiveStates.LyricsWindowStatus.MonitorBounds.Top,
+                },
+                LiveStates.LyricsWindowStatus.MonitorBounds.Width,
+                LiveStates.LyricsWindowStatus.DockPlacement switch
+                {
+                    Enums.DockPlacement.Top => LiveStates.LyricsWindowStatus.DockHeight,
+                    Enums.DockPlacement.Bottom => LiveStates.LyricsWindowStatus.DockHeight + 1,
+                    _ => LiveStates.LyricsWindowStatus.DockHeight,
+                }
+            );
        }
    }
 }
--- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Services/MediaSessionsService/MediaSessionsService.cs
+++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Services/MediaSessionsService/MediaSessionsService.cs
@@ -322,13 +322,9 @@ namespace BetterLyrics.WinUI3.Services.MediaSessionsService
                        fixedArtist = mediaProperties.Artist.Split(" — ").FirstOrDefault() ?? mediaProperties.Artist;
                        fixedAlbum = mediaProperties.Artist.Split(" — ").LastOrDefault() ?? mediaProperties.AlbumTitle;
                    }
-                    else if (sessionId == Constants.PlayerID.NetEaseCloudMusic)
+                    else if (PlayerIdMatcher.IsNeteaseFamily(sessionId))
                    {
                        songId = mediaProperties.Genres.FirstOrDefault()?.Replace("NCM-", "");
-                        if (songId != null && songId.Length != 10)
-                        {
-                            songId = null;
-                        }
                    }

                    _cachedSongInfo = new SongInfo
--- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/ViewModels/LyricsRendererViewModel/LyricsRendererViewModel.Messages.cs
+++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/ViewModels/LyricsRendererViewModel/LyricsRendererViewModel.Messages.cs
@@ -8,6 +8,7 @@ using Microsoft.Extensions.Logging;
 using Microsoft.UI.Xaml;
 using System;
 using System.Collections.ObjectModel;
+using System.Diagnostics;
 using System.Linq;
 using System.Threading.Tasks;
 using Windows.UI;
--- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/ViewModels/LyricsRendererViewModel/LyricsRendererViewModel.Update.cs
+++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/ViewModels/LyricsRendererViewModel/LyricsRendererViewModel.Update.cs
@@ -406,12 +406,16 @@ namespace BetterLyrics.WinUI3.ViewModels.LyricsRendererViewModel

            _titleXTransition.Update(_elapsedTime);
            _titleYTransition.Update(_elapsedTime);
+
            _lyricsXTransition.Update(_elapsedTime);
            _lyricsYTransition.Update(_elapsedTime);
+            
            _albumArtXTransition.Update(_elapsedTime);
            _albumArtYTransition.Update(_elapsedTime);
+            
            _lyricsOpacityTransition.Update(_elapsedTime);
            _albumArtOpacityTransition.Update(_elapsedTime);
+            
            _immersiveBgOpacityTransition.Update(_elapsedTime);
            _immersiveBgColorTransition.Update(_elapsedTime);
            
--- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/ViewModels/LyricsWindowViewModel.cs
+++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/ViewModels/LyricsWindowViewModel.cs
@@ -154,7 +154,10 @@ namespace BetterLyrics.WinUI3
                        {
                            presenter.IsAlwaysOnTop = true;
                        }
-                        UpdateBackdropAccentColor(hwnd);
+                        if (_liveStatesService.LiveStates.LyricsWindowStatus.IsAdaptToEnvironment)
+                        {
+                            UpdateBackdropAccentColor(hwnd);
+                        }
                    }, Constants.Time.DebounceTimeout);
                }
            );
--- a/README.md
+++ b/README.md
@@ -156,7 +156,7 @@ Check out the article: [BetterLyrics – An immersive and smooth lyrics display

 ## Demonstration

-Watch our introduction video (uploaded on 18 Aug 2025) on Bilibili [here](https://www.bilibili.com/video/BV1yLYtzQEME/).
+Watch our demo video (uploaded on 21 Oct 2025) on Bilibili [here](https://www.bilibili.com/video/BV1QRstz1EGt/).

 ## Try it now
Author	SHA1	Message	Date
Zhe Fang	d0b626c508	fix: issue related with docked mode	2025-10-22 10:52:57 -04:00
Zhe Fang	67a45e90fa	chore: update version code	2025-10-22 10:31:14 -04:00
Zhe Fang	b4c7655043	chores: move window color sampling settings item to general tab, remove useless debug writeline	2025-10-22 10:23:50 -04:00
Zhe Fang	2adc2aced2	fix: window color sampling incorrect behavior	2025-10-22 10:18:49 -04:00
Zhe Fang	e638739638	fix: improve docked mode window sizeing behaviors	2025-10-22 09:24:16 -04:00
Zhe Fang	c24213358e	Merge pull request #118 from Storyteller-Studios/dev Improve identification of NeteaseFamily and fix Lrc Parser unexpected behavior when parsing [Min:Sec:MillSec]	2025-10-22 07:58:28 -04:00
Raspberry-Monster	6e78f849c4	chores: Improve LrcParser	2025-10-22 14:10:23 +08:00
Raspberry-Monster	80444b69e0	chores: Improve identification of NeteaseFamily and fix Lrc Parser unexpected behavior when parsing [Min:Sec:MillSec]	2025-10-22 13:06:33 +08:00
Zhe Fang	78775e9bb3	Update README.md	2025-10-21 22:51:53 -04:00