fix: issue related with docked mode

Improve identification of NeteaseFamily and fix Lrc Parser unexpected behavior when parsing [Min:Sec:MillSec]

BetterLyrics.WinUI3/BetterLyrics.WinUI3 (Package)/Package.appxmanifest

@@ -12,7 +12,7 @@
 	<Identity
 	  Name="37412.BetterLyrics"
 	  Publisher="CN=E1428B0E-DC1D-4EA4-ACB1-4556569D5BA9"
-	  Version="1.0.81.0" />
+	  Version="1.0.83.0" />
 
 	<mp:PhoneIdentity PhoneProductId="ca4a4830-fc19-40d9-b823-53e2bff3d816" PhonePublisherId="00000000-0000-0000-0000-000000000000"/>
 

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Controls/ExtendedSlider.xaml

@@ -4,20 +4,14 @@
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+    xmlns:interactivity="using:Microsoft.Xaml.Interactivity"
     xmlns:local="using:BetterLyrics.WinUI3.Controls"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     xmlns:ui="using:CommunityToolkit.WinUI"
     mc:Ignorable="d">
 
-    <StackPanel Orientation="Horizontal">
-        <TextBlock
-            Margin="6,0,2,0"
-            VerticalAlignment="Center"
-            Text="{x:Bind Value, Mode=OneWay}" />
-        <TextBlock
-            Margin="0,0,14,0"
-            VerticalAlignment="Center"
-            Text="{x:Bind Unit, Mode=OneWay}" />
+    <StackPanel>
+
         <Slider
             Maximum="{x:Bind Maximum, Mode=OneWay}"
             Minimum="{x:Bind Minimum, Mode=OneWay}"
@@ -26,32 +20,42 @@
             TickFrequency="{x:Bind Frequency, Mode=OneWay}"
             TickPlacement="None"
             Value="{x:Bind Value, Mode=TwoWay}" />
-        <Button
-            Margin="3,0,0,0"
-            VerticalAlignment="Center"
-            Click="ResetButton_Click"
-            Content="{ui:FontIcon FontFamily={StaticResource IconFontFamily},
-                                  FontSize=12,
-                                  Glyph=&#xE777;}"
-            Style="{StaticResource GhostButtonStyle}"
-            Visibility="{x:Bind ResetButtonVisibility, Mode=OneWay}" />
-        <Button
-            x:Name="SubtractButton"
-            Margin="3,0,0,0"
-            VerticalAlignment="Center"
-            Click="SubtractButton_Click"
-            Content="{ui:FontIcon FontFamily={StaticResource IconFontFamily},
-                                  FontSize=12,
-                                  Glyph=&#xE738;}"
-            Style="{StaticResource GhostButtonStyle}" />
-        <Button
-            x:Name="AddButton"
-            Margin="3,0,0,0"
-            VerticalAlignment="Center"
-            Click="AddButton_Click"
-            Content="{ui:FontIcon FontFamily={StaticResource IconFontFamily},
-                                  FontSize=12,
-                                  Glyph=&#xE710;}"
-            Style="{StaticResource GhostButtonStyle}" />
+
+        <StackPanel HorizontalAlignment="Right" Orientation="Horizontal">
+            <Button
+                VerticalAlignment="Center"
+                Click="ResetButton_Click"
+                Content="{ui:FontIcon FontFamily={StaticResource IconFontFamily},
+                                      FontSize=12,
+                                      Glyph=&#xE777;}"
+                Style="{StaticResource GhostButtonStyle}"
+                Visibility="{x:Bind ResetButtonVisibility, Mode=OneWay}" />
+            <Button
+                x:Name="SubtractButton"
+                VerticalAlignment="Center"
+                Click="SubtractButton_Click"
+                Content="{ui:FontIcon FontFamily={StaticResource IconFontFamily},
+                                      FontSize=12,
+                                      Glyph=&#xE738;}"
+                Style="{StaticResource GhostButtonStyle}" />
+
+            <StackPanel
+                Margin="3,-2,3,0"
+                Orientation="Horizontal"
+                Spacing="2">
+                <TextBlock VerticalAlignment="Center" Text="{x:Bind Value, Mode=OneWay}" />
+                <TextBlock VerticalAlignment="Center" Text="{x:Bind Unit, Mode=OneWay}" />
+            </StackPanel>
+
+            <Button
+                x:Name="AddButton"
+                VerticalAlignment="Center"
+                Click="AddButton_Click"
+                Content="{ui:FontIcon FontFamily={StaticResource IconFontFamily},
+                                      FontSize=12,
+                                      Glyph=&#xE710;}"
+                Style="{StaticResource GhostButtonStyle}" />
+        </StackPanel>
+
     </StackPanel>
 </UserControl>

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Controls/LyricsWindowSettingsControl.xaml

@@ -117,18 +117,6 @@
                                     </StackPanel>
                                 </controls:SettingsCard>
 
-                                <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}" />
-                                        <Button
-                                            Command="{x:Bind ViewModel.RefreshMonitorDeviceNamesCommand}"
-                                            Content="{ui:FontIcon FontFamily={StaticResource IconFontFamily},
-                                                                  FontSize=12,
-                                                                  Glyph=&#xE72C;}"
-                                            Style="{StaticResource GhostButtonStyle}" />
-                                    </StackPanel>
-                                </controls:SettingsCard>
-
                                 <controls:SettingsExpander
                                     x:Uid="SettingsPageDisplayTypeSwitcher"
                                     HeaderIcon="{ui:FontIcon FontFamily={StaticResource IconFontFamily},
@@ -149,6 +137,81 @@
                                     </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}" />
+                                        <Button
+                                            Command="{x:Bind ViewModel.RefreshMonitorDeviceNamesCommand}"
+                                            Content="{ui:FontIcon FontFamily={StaticResource IconFontFamily},
+                                                                  FontSize=12,
+                                                                  Glyph=&#xE72C;}"
+                                            Style="{StaticResource GhostButtonStyle}" />
+                                    </StackPanel>
+                                </controls:SettingsCard>
+
+                                <controls:SettingsExpander
+                                    x:Uid="SettingsPageWindowBounds"
+                                    HeaderIcon="{ui:FontIcon FontFamily={StaticResource IconFontFamily},
+                                                             Glyph=&#xF16B;}"
+                                    IsExpanded="True">
+                                    <controls:SettingsExpander.Items>
+                                        <controls:SettingsCard Header="X">
+                                            <uc:ExtendedSlider
+                                                Frequency="1"
+                                                Maximum="{x:Bind ViewModel.LiveStates.LyricsWindowStatus.MonitorBounds.Right, Mode=OneWay}"
+                                                Minimum="{x:Bind ViewModel.LiveStates.LyricsWindowStatus.MonitorBounds.Left, Mode=OneWay}"
+                                                ResetButtonVisibility="Collapsed"
+                                                Unit="px"
+                                                Value="{x:Bind ViewModel.LiveStates.LyricsWindowStatus.WindowX, Mode=TwoWay}" />
+                                        </controls:SettingsCard>
+                                        <controls:SettingsCard Header="Y">
+                                            <uc:ExtendedSlider
+                                                Frequency="1"
+                                                Maximum="{x:Bind ViewModel.LiveStates.LyricsWindowStatus.MonitorBounds.Bottom, Mode=OneWay}"
+                                                Minimum="{x:Bind ViewModel.LiveStates.LyricsWindowStatus.MonitorBounds.Top, Mode=OneWay}"
+                                                ResetButtonVisibility="Collapsed"
+                                                Unit="px"
+                                                Value="{x:Bind ViewModel.LiveStates.LyricsWindowStatus.WindowY, Mode=TwoWay}" />
+                                        </controls:SettingsCard>
+                                        <controls:SettingsCard x:Uid="SettingsPageWidth">
+                                            <uc:ExtendedSlider
+                                                Frequency="1"
+                                                Maximum="{x:Bind ViewModel.LiveStates.LyricsWindowStatus.MonitorBounds.Width, Mode=OneWay}"
+                                                Minimum="64"
+                                                ResetButtonVisibility="Collapsed"
+                                                Unit="px"
+                                                Value="{x:Bind ViewModel.LiveStates.LyricsWindowStatus.WindowWidth, Mode=TwoWay}" />
+                                        </controls:SettingsCard>
+                                        <controls:SettingsCard x:Uid="SettingsPageHeight">
+                                            <uc:ExtendedSlider
+                                                Frequency="1"
+                                                Maximum="{x:Bind ViewModel.LiveStates.LyricsWindowStatus.MonitorBounds.Height, Mode=OneWay}"
+                                                Minimum="64"
+                                                ResetButtonVisibility="Collapsed"
+                                                Unit="px"
+                                                Value="{x:Bind ViewModel.LiveStates.LyricsWindowStatus.WindowHeight, Mode=TwoWay}" />
+                                        </controls:SettingsCard>
+                                    </controls:SettingsExpander.Items>
+                                </controls:SettingsExpander>
+
                                 <controls:SettingsExpander
                                     x:Uid="SettingsPageAOT"
                                     HeaderIcon="{ui:FontIcon FontFamily={StaticResource IconFontFamily},
@@ -230,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" />

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)

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();
     }
 }

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;
+        }
+    }
+}

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Helper/RectHelper.cs

@@ -38,5 +38,25 @@ namespace BetterLyrics.WinUI3.Helper
                 rect.Height
             );
         }
+
+        public static Windows.Foundation.Rect WithX(this Windows.Foundation.Rect rect, double x)
+        {
+            return new Windows.Foundation.Rect(
+                x,
+                rect.Y,
+                rect.Width,
+                rect.Height
+            );
+        }
+
+        public static Windows.Foundation.Rect WithY(this Windows.Foundation.Rect rect, double y)
+        {
+            return new Windows.Foundation.Rect(
+                rect.X,
+                y,
+                rect.Width,
+                rect.Height
+            );
+        }
     }
 }

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()

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/LyricsWindowStatus.cs

@@ -36,6 +36,10 @@ namespace BetterLyrics.WinUI3.Models
         [ObservableProperty][NotifyPropertyChangedRecipients] public partial WindowPixelSampleMode EnvironmentSampleMode { get; set; } = WindowPixelSampleMode.WindowEdge;
         [ObservableProperty][NotifyPropertyChangedRecipients] public partial bool AutoShowOrHideWindow { get; set; } = false;
         [ObservableProperty][NotifyPropertyChangedRecipients] public partial TitleBarArea TitleBarArea { get; set; } = TitleBarArea.Top;
+        [ObservableProperty][NotifyPropertyChangedRecipients] public partial double WindowX { get; set; } = 100;
+        [ObservableProperty][NotifyPropertyChangedRecipients] public partial double WindowY { get; set; } = 100;
+        [ObservableProperty][NotifyPropertyChangedRecipients] public partial double WindowWidth { get; set; } = 800;
+        [ObservableProperty][NotifyPropertyChangedRecipients] public partial double WindowHeight { get; set; } = 500;
 
         public LyricsWindowStatus()
         {
@@ -43,6 +47,26 @@ namespace BetterLyrics.WinUI3.Models
             UpdateDemoWindowAndMonitorBounds();
         }
 
+        partial void OnWindowXChanged(double value)
+        {
+            WindowBounds = WindowBounds.WithX(value);
+        }
+
+        partial void OnWindowYChanged(double value)
+        {
+            WindowBounds = WindowBounds.WithY(value);
+        }
+
+        partial void OnWindowWidthChanged(double value)
+        {
+            WindowBounds = WindowBounds.WithWidth(value);
+        }
+
+        partial void OnWindowHeightChanged(double value)
+        {
+            WindowBounds = WindowBounds.WithHeight(value);
+        }
+
         partial void OnLyricsStyleSettingsChanged(LyricsStyleSettings oldValue, LyricsStyleSettings newValue)
         {
             oldValue.PropertyChanged -= OldLyricsStyleSettings_PropertyChanged;
@@ -168,12 +192,19 @@ namespace BetterLyrics.WinUI3.Models
             return new LyricsWindowStatus
             {
                 Name = App.ResourceLoader!.GetString("DesktopMode"),
-                WindowBounds = new Rect(100, 100, 400, 250),
+                LyricsDisplayType = LyricsDisplayType.LyricsOnly,
+                WindowBounds = new Rect(100, 100, 600, 250),
                 IsAlwaysOnTop = true,
                 IsAlwaysOnTopPolling = true,
                 IsBorderless = true,
+                IsClickThrough = true,
                 IsAdaptToEnvironment = true,
-                EnvironmentSampleMode = Enums.WindowPixelSampleMode.WindowEdge,
+                EnvironmentSampleMode = WindowPixelSampleMode.WindowEdge,
+                LyricsStyleSettings = new()
+                {
+                    LyricsFontSize = 20,
+                    LyricsAlignmentType = TextAlignmentType.Center,
+                },
                 LyricsBackgroundSettings = new LyricsBackgroundSettings
                 {
                     IsPureColorOverlayEnabled = false,

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/MediaSourceProviderInfo.cs

@@ -36,7 +36,7 @@ namespace BetterLyrics.WinUI3.Models
             PositionOffset = 0;
         }
 
-        public MediaSourceProviderInfo(string provider, bool isEnable = true) : base()
+        public MediaSourceProviderInfo(string provider, bool isEnable = true)
         {
             IsEnabled = isEnable;
             switch (provider)
@@ -54,6 +54,12 @@ namespace BetterLyrics.WinUI3.Models
             }
 
             Provider = provider;
+
+            AlbumArtSearchProvidersInfo.ItemPropertyChanged += AlbumArtSearchProvidersInfo_ItemPropertyChanged;
+            AlbumArtSearchProvidersInfo.CollectionChanged += AlbumArtSearchProvidersInfo_CollectionChanged;
+
+            LyricsSearchProvidersInfo.ItemPropertyChanged += LyricsSearchProvidersInfo_ItemPropertyChanged;
+            LyricsSearchProvidersInfo.CollectionChanged += LyricsSearchProvidersInfo_CollectionChanged;
         }
 
         partial void OnAlbumArtSearchProvidersInfoChanged(FullyObservableCollection<AlbumArtSearchProviderInfo> oldValue, FullyObservableCollection<AlbumArtSearchProviderInfo> newValue)

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/Settings/GeneralSettings.cs

@@ -13,7 +13,6 @@ namespace BetterLyrics.WinUI3.Models.Settings
         [ObservableProperty][NotifyPropertyChangedRecipients] public partial Language Language { get; set; } = Language.FollowSystem;
         [ObservableProperty][NotifyPropertyChangedRecipients] public partial string LXMusicServer { get; set; } = string.Empty;
         [ObservableProperty][NotifyPropertyChangedRecipients] public partial List<string> ShowOrHideLyricsWindowShortcut { get; set; } = new List<string> { "Ctrl", "Alt", "H" };
-        [ObservableProperty][NotifyPropertyChangedRecipients] public partial bool IsImmersiveMode { get; set; } = false;
         [ObservableProperty][NotifyPropertyChangedRecipients] public partial bool ExitOnLyricsWindowClosed { get; set; } = false;
         [ObservableProperty][NotifyPropertyChangedRecipients] public partial bool ListenOnNewPlaybackSource { get; set; } = true;
         [ObservableProperty][NotifyPropertyChangedRecipients] public partial List<string> BorderlessShortcut { get; set; } = new List<string>() { "Ctrl", "Alt", "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,
+                }
+            );
         }
     }
 }

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

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

@@ -721,6 +721,9 @@ If you encounter any problems, please go to the Settings page, About tab, and vi
   <data name="SettingsPageFullscreenMode.Text" xml:space="preserve">
     <value>Fullscreen mode</value>
   </data>
+  <data name="SettingsPageHeight.Header" xml:space="preserve">
+    <value>Height</value>
+  </data>
   <data name="SettingsPageHideWindow.Description" xml:space="preserve">
     <value>Automatically hide/show lyric window when music is not playing</value>
   </data>
@@ -1207,6 +1210,12 @@ If you encounter any problems, please go to the Settings page, About tab, and vi
   <data name="SettingsPageVersion.Text" xml:space="preserve">
     <value>Version</value>
   </data>
+  <data name="SettingsPageWidth.Header" xml:space="preserve">
+    <value>Width</value>
+  </data>
+  <data name="SettingsPageWindowBounds.Header" xml:space="preserve">
+    <value>Window bounds</value>
+  </data>
   <data name="SettingsPageWorkArea.Description" xml:space="preserve">
     <value>As a separate work area docked to the upper/lower edge of the screen</value>
   </data>

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

@@ -721,6 +721,9 @@
   <data name="SettingsPageFullscreenMode.Text" xml:space="preserve">
     <value>フルスクリーンモード</value>
   </data>
+  <data name="SettingsPageHeight.Header" xml:space="preserve">
+    <value>高さ</value>
+  </data>
   <data name="SettingsPageHideWindow.Description" xml:space="preserve">
     <value>音楽が再生されていないときに、自動的に歌詞ウィンドウを非表示/表示します</value>
   </data>
@@ -1207,6 +1210,12 @@
   <data name="SettingsPageVersion.Text" xml:space="preserve">
     <value>バージョン</value>
   </data>
+  <data name="SettingsPageWidth.Header" xml:space="preserve">
+    <value>幅</value>
+  </data>
+  <data name="SettingsPageWindowBounds.Header" xml:space="preserve">
+    <value>ウィンドウ境界</value>
+  </data>
   <data name="SettingsPageWorkArea.Description" xml:space="preserve">
     <value>画面の上下端にドッキングされた別の作業エリアとして</value>
   </data>

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

@@ -721,6 +721,9 @@
   <data name="SettingsPageFullscreenMode.Text" xml:space="preserve">
     <value>전체화면 모드</value>
   </data>
+  <data name="SettingsPageHeight.Header" xml:space="preserve">
+    <value>신장</value>
+  </data>
   <data name="SettingsPageHideWindow.Description" xml:space="preserve">
     <value>음악이 재생되지 않을 때 자동으로 가사 창 숨기기/표시</value>
   </data>
@@ -1207,6 +1210,12 @@
   <data name="SettingsPageVersion.Text" xml:space="preserve">
     <value>버전</value>
   </data>
+  <data name="SettingsPageWidth.Header" xml:space="preserve">
+    <value>너비</value>
+  </data>
+  <data name="SettingsPageWindowBounds.Header" xml:space="preserve">
+    <value>창 범위</value>
+  </data>
   <data name="SettingsPageWorkArea.Description" xml:space="preserve">
     <value>화면의 상단/하단 가장자리에 고정된 별도의 작업 영역으로</value>
   </data>

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

@@ -721,6 +721,9 @@
   <data name="SettingsPageFullscreenMode.Text" xml:space="preserve">
     <value>全屏模式</value>
   </data>
+  <data name="SettingsPageHeight.Header" xml:space="preserve">
+    <value>高度</value>
+  </data>
   <data name="SettingsPageHideWindow.Description" xml:space="preserve">
     <value>音乐未播放/播放时自动隐藏/显示歌词窗口</value>
   </data>
@@ -1207,6 +1210,12 @@
   <data name="SettingsPageVersion.Text" xml:space="preserve">
     <value>版本号</value>
   </data>
+  <data name="SettingsPageWidth.Header" xml:space="preserve">
+    <value>宽度</value>
+  </data>
+  <data name="SettingsPageWindowBounds.Header" xml:space="preserve">
+    <value>窗口边界</value>
+  </data>
   <data name="SettingsPageWorkArea.Description" xml:space="preserve">
     <value>作为一个独立的工作区域停靠在屏幕的上/下边缘</value>
   </data>

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

@@ -721,6 +721,9 @@
   <data name="SettingsPageFullscreenMode.Text" xml:space="preserve">
     <value>全螢幕模式</value>
   </data>
+  <data name="SettingsPageHeight.Header" xml:space="preserve">
+    <value>高度</value>
+  </data>
   <data name="SettingsPageHideWindow.Description" xml:space="preserve">
     <value>音樂未播放/播放時自動隱藏/顯示歌詞視窗</value>
   </data>
@@ -1207,6 +1210,12 @@
   <data name="SettingsPageVersion.Text" xml:space="preserve">
     <value>版本號</value>
   </data>
+  <data name="SettingsPageWidth.Header" xml:space="preserve">
+    <value>寬度</value>
+  </data>
+  <data name="SettingsPageWindowBounds.Header" xml:space="preserve">
+    <value>窗戶邊界</value>
+  </data>
   <data name="SettingsPageWorkArea.Description" xml:space="preserve">
     <value>作為一個獨立的工作區域停靠在螢幕的上/下邊緣</value>
   </data>

BetterLyrics.WinUI3/BetterLyrics.WinUI3/ViewModels/LyricsPageViewModel.cs

@@ -23,7 +23,6 @@ using System.Threading.Tasks;
 namespace BetterLyrics.WinUI3.ViewModels
 {
     public partial class LyricsPageViewModel : BaseViewModel,
-        IRecipient<PropertyChangedMessage<bool>>,
         IRecipient<PropertyChangedMessage<TimeSpan>>
     {
         private readonly IMediaSessionsService _mediaSessionsService;
@@ -39,10 +38,6 @@ namespace BetterLyrics.WinUI3.ViewModels
 
             LiveStates = _liveStatesService.LiveStates;
 
-            IsImmersiveMode = _settingsService.AppSettings.GeneralSettings.IsImmersiveMode;
-
-            OnIsImmersiveModeChanged(IsImmersiveMode);
-
             //Volume = SystemVolumeHelper.GetMasterVolume();
             //SystemVolumeHelper.VolumeChanged += SystemVolumeHelper_VolumeChanged;
 
@@ -87,9 +82,6 @@ namespace BetterLyrics.WinUI3.ViewModels
         [ObservableProperty]
         public partial int Volume { get; set; }
 
-        [ObservableProperty]
-        public partial bool IsImmersiveMode { get; set; }
-
         [ObservableProperty]
         public partial double BottomCommandGridOpacity { get; set; }
 
@@ -111,16 +103,6 @@ namespace BetterLyrics.WinUI3.ViewModels
         [ObservableProperty]
         public partial double TimelineSliderThumbSeconds { get; set; } = 0;
 
-        public void Receive(PropertyChangedMessage<bool> message)
-        {
-            if (message.Sender is LyricsWindowViewModel)
-            {
-                if (message.PropertyName == nameof(LyricsWindowViewModel.IsImmersiveMode))
-                {
-                    IsImmersiveMode = message.NewValue;
-                }
-            }
-        }
 
         [RelayCommand]
         private static void OpenSettingsWindow()
@@ -152,20 +134,6 @@ namespace BetterLyrics.WinUI3.ViewModels
             await _mediaSessionsService.NextAsync();
         }
 
-        partial void OnIsImmersiveModeChanged(bool value)
-        {
-            if (value)
-            {
-                BottomCommandGridOpacity = 0f;
-                BottomCommandFlyoutTriggerOpacity = 0f;
-            }
-            else
-            {
-                BottomCommandGridOpacity = 1f;
-                BottomCommandFlyoutTriggerOpacity = 1f;
-            }
-        }
-
         partial void OnTimelineSliderThumbSecondsChanged(double value)
         {
             TimelineSliderThumbLyricsLine = _mediaSessionsService.CurrentLyricsData?.GetLyricsLine(value);

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;

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);
             

BetterLyrics.WinUI3/BetterLyrics.WinUI3/ViewModels/LyricsWindowViewModel.cs

@@ -49,9 +49,6 @@ namespace BetterLyrics.WinUI3
             AppSettings = _settingsService.AppSettings;
             LiveStates = _liveStatesService.LiveStates;
 
-            IsImmersiveMode = _settingsService.AppSettings.GeneralSettings.IsImmersiveMode;
-            OnIsImmersiveModeChanged(_settingsService.AppSettings.GeneralSettings.IsImmersiveMode);
-
             _mediaSessionsService.IsPlayingChanged += PlaybackService_IsPlayingChanged;
         }
 
@@ -69,9 +66,7 @@ namespace BetterLyrics.WinUI3
         /// </summary>
         [ObservableProperty][NotifyPropertyChangedRecipients] public partial Color BackdropAccentColor { get; set; }
 
-        [ObservableProperty][NotifyPropertyChangedRecipients] public partial bool IsImmersiveMode { get; set; }
-
-        [ObservableProperty] public partial double TopCommandGridOpacity { get; set; }
+        [ObservableProperty] public partial double TopCommandGridOpacity { get; set; } = 0;
 
         [ObservableProperty] public partial ElementTheme ThemeType { get; set; } = ElementTheme.Default;
 
@@ -79,18 +74,6 @@ namespace BetterLyrics.WinUI3
 
         [ObservableProperty] public partial Visibility CloseButtonVisibility { get; set; } = Visibility.Visible;
 
-        partial void OnIsImmersiveModeChanged(bool value)
-        {
-            if (value)
-            {
-                TopCommandGridOpacity = 0f;
-            }
-            else
-            {
-                TopCommandGridOpacity = 1f;
-            }
-        }
-
         public void InitShortcuts()
         {
             UpdateLyricsWindowBorderlessShortcut();
@@ -171,7 +154,10 @@ namespace BetterLyrics.WinUI3
                         {
                             presenter.IsAlwaysOnTop = true;
                         }
-                        UpdateBackdropAccentColor(hwnd);
+                        if (_liveStatesService.LiveStates.LyricsWindowStatus.IsAdaptToEnvironment)
+                        {
+                            UpdateBackdropAccentColor(hwnd);
+                        }
                     }, Constants.Time.DebounceTimeout);
                 }
             );
@@ -205,12 +191,6 @@ namespace BetterLyrics.WinUI3
             _liveStatesService.RefreshLyricsWindowStatus();
         }
 
-        [RelayCommand]
-        private void OnImmersiveToggleButtonEnabledChanged()
-        {
-            _settingsService.AppSettings.GeneralSettings.IsImmersiveMode = IsImmersiveMode;
-        }
-
         public void Receive(PropertyChangedMessage<List<string>> message)
         {
             if (message.Sender is GeneralSettings)

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

@@ -34,7 +34,7 @@ namespace BetterLyrics.WinUI3.Views
 
         private void BottomCommandGrid_PointerEntered(object sender, Microsoft.UI.Xaml.Input.PointerRoutedEventArgs e)
         {
-            if (ViewModel.IsImmersiveMode && BottomCommandGrid.Children.Count != 0)
+            if (BottomCommandGrid.Children.Count != 0)
             {
                 ViewModel.BottomCommandGridOpacity = 1f;
             }
@@ -43,7 +43,7 @@ namespace BetterLyrics.WinUI3.Views
 
         private void BottomCommandGrid_PointerExited(object sender, Microsoft.UI.Xaml.Input.PointerRoutedEventArgs e)
         {
-            if (ViewModel.IsImmersiveMode && BottomCommandGrid.Children.Count != 0)
+            if (BottomCommandGrid.Children.Count != 0)
             {
                 ViewModel.BottomCommandGridOpacity = 0f;
             }
@@ -90,7 +90,7 @@ namespace BetterLyrics.WinUI3.Views
 
         private void BottomCommandFlyoutTrigger_PointerEntered(object sender, Microsoft.UI.Xaml.Input.PointerRoutedEventArgs e)
         {
-            if (ViewModel.IsImmersiveMode && BottomCommandFlyoutContainer.Children.Count != 0)
+            if (BottomCommandFlyoutContainer.Children.Count != 0)
             {
                 ViewModel.BottomCommandFlyoutTriggerOpacity = 1f;
             }
@@ -98,7 +98,7 @@ namespace BetterLyrics.WinUI3.Views
 
         private void BottomCommandFlyoutTrigger_PointerExited(object sender, Microsoft.UI.Xaml.Input.PointerRoutedEventArgs e)
         {
-            if (ViewModel.IsImmersiveMode && BottomCommandFlyoutContainer.Children.Count != 0)
+            if (BottomCommandFlyoutContainer.Children.Count != 0)
             {
                 ViewModel.BottomCommandFlyoutTriggerOpacity = 0f;
             }

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Views/LyricsWindow.xaml

@@ -56,20 +56,6 @@
                             <ToolTip x:Uid="HostWindowMusicGalleryButtonToolTip" />
                         </ToolTipService.ToolTip>
                     </Button>
-                    <!--  Immersive mode  -->
-                    <ToggleButton
-                        x:Name="ImmersiveButton"
-                        Command="{x:Bind ViewModel.ImmersiveToggleButtonEnabledChangedCommand}"
-                        IsChecked="{x:Bind ViewModel.IsImmersiveMode, Mode=TwoWay}"
-                        Style="{StaticResource TitleBarToggleButtonStyle}">
-                        <ToolTipService.ToolTip>
-                            <ToolTip x:Uid="LyricsWindowImmersiveButtonToolTip" />
-                        </ToolTipService.ToolTip>
-                        <FontIcon
-                            FontFamily="{StaticResource IconFontFamily}"
-                            FontSize="{x:Bind ViewModel.TitleBarFontSize}"
-                            Glyph="&#xED1A;" />
-                    </ToggleButton>
 
                 </StackPanel>
             </Grid>

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Views/LyricsWindow.xaml.cs

@@ -95,24 +95,22 @@ namespace BetterLyrics.WinUI3.Views
                 else
                 {
                     _liveStatesService.LiveStates.LyricsWindowStatus.WindowBounds = new Windows.Foundation.Rect(rect.X, rect.Y, size.Width, size.Height);
+                    _liveStatesService.LiveStates.LyricsWindowStatus.WindowX = rect.X;
+                    _liveStatesService.LiveStates.LyricsWindowStatus.WindowY = rect.Y;
+                    _liveStatesService.LiveStates.LyricsWindowStatus.WindowWidth = size.Width;
+                    _liveStatesService.LiveStates.LyricsWindowStatus.WindowHeight = size.Height;
                 }
             }
         }
 
         private void TopCommandGrid_PointerEntered(object sender, PointerRoutedEventArgs e)
         {
-            if (ViewModel.IsImmersiveMode)
-            {
-                ViewModel.TopCommandGridOpacity = 1f;
-            }
+            ViewModel.TopCommandGridOpacity = 1f;
         }
 
         private void TopCommandGrid_PointerExited(object sender, PointerRoutedEventArgs e)
         {
-            if (ViewModel.IsImmersiveMode)
-            {
-                ViewModel.TopCommandGridOpacity = 0f;
-            }
+            ViewModel.TopCommandGridOpacity = 0f;
         }
 
         private void MusicGalleryButton_Click(object sender, RoutedEventArgs e)

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
 
@@ -182,7 +182,7 @@ Watch our introduction video (uploaded on 18 Aug 2025) on Bilibili [here](https:
 
 If you are using a third-party modified Windows, you probably can not launch the app.
 
-To solve this issue, please try to download from [Google Drive (v1.0.81.0)](https://drive.google.com/file/d/1YT8Cg5unPoNJO0FBR9s4w7T2pCLIZQz9/view?usp=sharing) (may not be the latest version) and follow the instructions [here](https://github.com/jayfunc/BetterLyrics/blob/dev/How2Install/How2Install.md).
+To solve this issue, please try to download from [Google Drive (v1.0.82.0)](https://drive.google.com/file/d/1UtGmmDqD5SWGJpp4LmWycHUT9-Bb8fur/view?usp=sharing) (may not be the latest version) and follow the instructions [here](https://github.com/jayfunc/BetterLyrics/blob/dev/How2Install/How2Install.md).
 
 ## Build