chores: bump version code

BetterLyrics.WinUI3/BetterLyrics.WinUI3 (Package)/BetterLyrics.WinUI3 (Package).wapproj

@@ -44,7 +44,7 @@
     <EntryPointProjectUniqueName>..\BetterLyrics.WinUI3\BetterLyrics.WinUI3.csproj</EntryPointProjectUniqueName>
     <GenerateAppInstallerFile>False</GenerateAppInstallerFile>
     <AppxPackageSigningTimestampDigestAlgorithm>SHA256</AppxPackageSigningTimestampDigestAlgorithm>
-    <AppxAutoIncrementPackageRevision>False</AppxAutoIncrementPackageRevision>
+    <AppxAutoIncrementPackageRevision>True</AppxAutoIncrementPackageRevision>
     <GenerateTestArtifacts>True</GenerateTestArtifacts>
     <AppxBundlePlatforms>x86|x64</AppxBundlePlatforms>
     <GenerateTemporaryStoreCertificate>True</GenerateTemporaryStoreCertificate>

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.99.0" />
+	  Version="1.0.106.0" />
 
 	<mp:PhoneIdentity PhoneProductId="ca4a4830-fc19-40d9-b823-53e2bff3d816" PhonePublisherId="00000000-0000-0000-0000-000000000000"/>
 

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

@@ -73,6 +73,16 @@ namespace BetterLyrics.WinUI3.Models
             newValue.PropertyChanged += OldAlbumArtLayoutSettings_PropertyChanged;
         }
 
+        partial void OnWindowBoundsChanged(Rect value)
+        {
+            UpdateMonitorNameAndBounds();
+            UpdateDemoWindowAndMonitorBounds();
+            WindowX = WindowBounds.X;
+            WindowY = WindowBounds.Y;
+            WindowWidth = WindowBounds.Width;
+            WindowHeight = WindowBounds.Height;
+        }
+
         private void OldLyricsStyleSettings_PropertyChanged(object? sender, System.ComponentModel.PropertyChangedEventArgs e)
         {
             this.OnPropertyChanged(nameof(LyricsStyleSettings));
@@ -135,6 +145,26 @@ namespace BetterLyrics.WinUI3.Models
             );
         }
 
+        public Rect GetWindowBoundsWhenWorkArea()
+        {
+            return new Rect(
+                MonitorBounds.X,
+                DockPlacement switch
+                {
+                    DockPlacement.Top => MonitorBounds.Top,
+                    DockPlacement.Bottom => MonitorBounds.Bottom - DockHeight,
+                    _ => MonitorBounds.Top,
+                } - 1,
+                MonitorBounds.Width,
+                DockPlacement switch
+                {
+                    DockPlacement.Top => DockHeight,
+                    DockPlacement.Bottom => DockHeight,
+                    _ => DockHeight,
+                } + 1
+            );
+        }
+
         public object Clone()
         {
             return new LyricsWindowStatus
@@ -191,7 +221,6 @@ namespace BetterLyrics.WinUI3.Models
                 EnvironmentSampleMode = WindowPixelSampleMode.WindowEdge,
                 LyricsStyleSettings = new()
                 {
-                    OriginalLyricsFontSize = 20,
                     LyricsAlignmentType = TextAlignmentType.Center,
                 },
                 LyricsBackgroundSettings = new LyricsBackgroundSettings
@@ -203,7 +232,7 @@ namespace BetterLyrics.WinUI3.Models
 
         public static LyricsWindowStatus DockedMode()
         {
-            return new LyricsWindowStatus
+            var status = new LyricsWindowStatus
             {
                 Name = _resourceService.GetLocalizedString("DockedMode"),
                 IsWorkArea = true,
@@ -218,7 +247,6 @@ namespace BetterLyrics.WinUI3.Models
                 LyricsStyleSettings = new LyricsStyleSettings
                 {
                     LyricsAlignmentType = TextAlignmentType.Center,
-                    OriginalLyricsFontSize = 18,
                 },
                 LyricsBackgroundSettings = new LyricsBackgroundSettings
                 {
@@ -226,31 +254,25 @@ namespace BetterLyrics.WinUI3.Models
                     IsPureColorOverlayEnabled = true,
                 }
             };
+            status.WindowBounds = status.GetWindowBoundsWhenWorkArea();
+            return status;
         }
 
-        public static LyricsWindowStatus FullscreenMode(Rect monitorBounds)
+        public static LyricsWindowStatus FullscreenMode()
         {
-            return new LyricsWindowStatus
+            var status = new LyricsWindowStatus
             {
                 Name = _resourceService.GetLocalizedString("FullscreenMode"),
-                WindowBounds = monitorBounds,
-                IsAlwaysOnTop = true,
                 IsBorderless = true,
-                IsShownInSwitchers = false,
-                TitleBarArea = Enums.TitleBarArea.None,
-                LyricsLayoutOrientation = Enums.LyricsLayoutOrientation.Vertical,
+                TitleBarArea = TitleBarArea.None,
+                LyricsLayoutOrientation = LyricsLayoutOrientation.Vertical,
                 LyricsStyleSettings = new LyricsStyleSettings
                 {
-                    OriginalLyricsFontSize = 72,
-                    LyricsAlignmentType = Enums.TextAlignmentType.Center,
+                    LyricsAlignmentType = TextAlignmentType.Center,
                 },
-                AlbumArtLayoutSettings = new AlbumArtLayoutSettings
-                {
-                    AutoAlbumArtSize = false,
-                    AlbumArtSize = 128,
-                    SongInfoFontSize = 36,
-                }
             };
+            status.WindowBounds = status.MonitorBounds;
+            return status;
         }
 
         public static LyricsWindowStatus StandardMode()

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Services/LiveStatesService/LiveStatesService.cs

@@ -44,7 +44,7 @@ namespace BetterLyrics.WinUI3.Services.LiveStatesService
                     if (LiveStates.LyricsWindowStatus.IsWorkArea)
                     {
                         await Task.Delay(300);
-                        WindowHelper.MoveAndResize<LyricsWindow>(GetWindowBoundsWhenWorkArea());
+                        WindowHelper.MoveAndResize<LyricsWindow>(LiveStates.LyricsWindowStatus.GetWindowBoundsWhenWorkArea());
                     }
                     break;
                 case nameof(LyricsWindowStatus.DockHeight):
@@ -55,7 +55,7 @@ namespace BetterLyrics.WinUI3.Services.LiveStatesService
                     {
                         WindowHelper.UpdateWorkArea<LyricsWindow>();
                         await Task.Delay(300);
-                        WindowHelper.MoveAndResize<LyricsWindow>(GetWindowBoundsWhenWorkArea());
+                        WindowHelper.MoveAndResize<LyricsWindow>(LiveStates.LyricsWindowStatus.GetWindowBoundsWhenWorkArea());
                     }
                     break;
                 case nameof(LyricsWindowStatus.IsShownInSwitchers):
@@ -82,14 +82,6 @@ namespace BetterLyrics.WinUI3.Services.LiveStatesService
                 case nameof(LyricsWindowStatus.WindowHeight):
                     WindowHelper.MoveAndResize<LyricsWindow>(LiveStates.LyricsWindowStatus.WindowBounds.WithHeight(LiveStates.LyricsWindowStatus.WindowHeight));
                     break;
-                case nameof(LyricsWindowStatus.WindowBounds):
-                    LiveStates.LyricsWindowStatus.UpdateMonitorNameAndBounds();
-                    LiveStates.LyricsWindowStatus.UpdateDemoWindowAndMonitorBounds();
-                    LiveStates.LyricsWindowStatus.WindowX = LiveStates.LyricsWindowStatus.WindowBounds.X;
-                    LiveStates.LyricsWindowStatus.WindowY = LiveStates.LyricsWindowStatus.WindowBounds.Y;
-                    LiveStates.LyricsWindowStatus.WindowWidth = LiveStates.LyricsWindowStatus.WindowBounds.Width;
-                    LiveStates.LyricsWindowStatus.WindowHeight = LiveStates.LyricsWindowStatus.WindowBounds.Height;
-                    break;
                 case nameof(LyricsWindowStatus.TitleBarArea):
                     WindowHelper.SetTitleBarArea<LyricsWindow>(LiveStates.LyricsWindowStatus.TitleBarArea);
                     break;
@@ -100,7 +92,7 @@ namespace BetterLyrics.WinUI3.Services.LiveStatesService
                     break;
             }
 
-            LiveStates.IsLyricsWindowStatusRefreshing = true;
+            LiveStates.IsLyricsWindowStatusRefreshing = false;
         }
 
         private void LiveStates_PropertyChanged(object? sender, System.ComponentModel.PropertyChangedEventArgs e)
@@ -135,41 +127,29 @@ namespace BetterLyrics.WinUI3.Services.LiveStatesService
 
             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(_dispatcherQueue);
             WindowHelper.SetTitleBarArea<LyricsWindow>(LiveStates.LyricsWindowStatus.TitleBarArea);
 
+            // 下述代码可以删除，但是为了避免给用户造成操作上的疑虑，暂时保留
             if (LiveStates.LyricsWindowStatus.IsWorkArea)
             {
-                LiveStates.LyricsWindowStatus.WindowBounds = GetWindowBoundsWhenWorkArea();
+                LiveStates.LyricsWindowStatus.WindowBounds = LiveStates.LyricsWindowStatus.GetWindowBoundsWhenWorkArea();
             }
 
             WindowHelper.MoveAndResize<LyricsWindow>(LiveStates.LyricsWindowStatus.WindowBounds);
+            LiveStates.LyricsWindowStatus.WindowX = LiveStates.LyricsWindowStatus.WindowBounds.X;
+            LiveStates.LyricsWindowStatus.WindowY = LiveStates.LyricsWindowStatus.WindowBounds.Y;
+            LiveStates.LyricsWindowStatus.WindowWidth = LiveStates.LyricsWindowStatus.WindowBounds.Width;
+            LiveStates.LyricsWindowStatus.WindowHeight = LiveStates.LyricsWindowStatus.WindowBounds.Height;
 
             LiveStates.LyricsWindowStatus.UpdateDemoWindowAndMonitorBounds();
 
             LiveStates.IsLyricsWindowStatusRefreshing = false;
         }
 
-        private Rect GetWindowBoundsWhenWorkArea()
-        {
-            return new 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/ViewModels/LyricsRendererViewModel/LyricsRendererViewModel.Update.cs

@@ -193,7 +193,7 @@ namespace BetterLyrics.WinUI3.ViewModels.LyricsRendererViewModel
                 _fluidEffect?.Properties["Width"] = (float)control.ConvertDipsToPixels((float)_canvasWidth, CanvasDpiRounding.Round);
                 _fluidEffect?.Properties["Height"] = (float)control.ConvertDipsToPixels((float)_canvasHeight, CanvasDpiRounding.Round);
 
-                //_topMargin = _bottomMargin = _leftMargin = _middleMargin = _rightMargin = Math.Max(_canvasWidth, _canvasHeight) / 30.0;
+                _topMargin = _bottomMargin = _leftMargin = _middleMargin = _rightMargin = Math.Max(_canvasWidth, _canvasHeight) / 30.0;
             }
 
             if (_isSongInfoFontSizeChanged || _isSongTitleVisibilityChanged || _isSongArtistsVisibilityChanged)
@@ -201,7 +201,7 @@ namespace BetterLyrics.WinUI3.ViewModels.LyricsRendererViewModel
                 _songInfoHeight = 0;
                 if (_liveStatesService.LiveStates.LyricsWindowStatus.AlbumArtLayoutSettings.ShowTitle)
                 {
-                    _songInfoHeight += (int)_titleTextFormat.FontSize;
+                    _songInfoHeight += (int)(_titleTextFormat.FontSize * (1.0 + 0.5));
                     if (_liveStatesService.LiveStates.LyricsWindowStatus.AlbumArtLayoutSettings.ShowArtists)
                     {
                         _songInfoHeight += (int)_artistTextFormat.FontSize;
@@ -260,7 +260,9 @@ namespace BetterLyrics.WinUI3.ViewModels.LyricsRendererViewModel
                     case LyricsLayoutOrientation.Vertical:
                         if (_liveStatesService.LiveStates.LyricsWindowStatus.AlbumArtLayoutSettings.AutoAlbumArtSize)
                         {
-                            _albumArtSize = 64;
+                            _albumArtSize = Math.Min((_canvasHeight - _topMargin - _bottomMargin) * 3.0 / 16.0,
+                                (_canvasWidth - _leftMargin - _middleMargin - _rightMargin) * 4.0 / 16.0);
+                            _albumArtSize = Math.Max(0, _albumArtSize);
                         }
                         else
                         {
@@ -470,8 +472,8 @@ namespace BetterLyrics.WinUI3.ViewModels.LyricsRendererViewModel
 
             if (_liveStatesService.LiveStates.LyricsWindowStatus.LyricsStyleSettings.IsDynamicLyricsFontSize)
             {
-                _originalLyricsFontSize = (int)Math.Clamp(Math.Min(_canvasHeight, _canvasWidth) / 15, 12, 96);
-                _translatedLyricsFontSize = _phoneticLyricsFontSize = (int)(_originalLyricsFontSize * 0.6);
+                _originalLyricsFontSize = (int)Math.Clamp(Math.Min(_canvasHeight, _canvasWidth) / 15, 18, 96);
+                _translatedLyricsFontSize = _phoneticLyricsFontSize = (int)(_originalLyricsFontSize * 2.0 / 3.0);
             }
             else
             {
@@ -481,6 +483,8 @@ namespace BetterLyrics.WinUI3.ViewModels.LyricsRendererViewModel
             }
 
             _originalLyricsFontWeight = _liveStatesService.LiveStates.LyricsWindowStatus.LyricsStyleSettings.LyricsFontWeight;
+            _titleTextFormat.FontWeight = _liveStatesService.LiveStates.LyricsWindowStatus.LyricsStyleSettings.LyricsFontWeight.ToFontWeight();
+            _artistTextFormat.FontWeight = _liveStatesService.LiveStates.LyricsWindowStatus.LyricsStyleSettings.LyricsFontWeight.ToFontWeight();
 
             if (SongInfo != null)
             {

BetterLyrics.WinUI3/BetterLyrics.WinUI3/ViewModels/LyricsWindowSettingsControlViewModel.cs

@@ -80,7 +80,7 @@ namespace BetterLyrics.WinUI3.ViewModels
         [RelayCommand]
         private void CreateFullLyricsWindowStatus()
         {
-            AppSettings.WindowBoundsRecords.Add(LyricsWindowStatusExtensions.FullscreenMode(LiveStates.LyricsWindowStatus.MonitorBounds));
+            AppSettings.WindowBoundsRecords.Add(LyricsWindowStatusExtensions.FullscreenMode());
         }
 
         [RelayCommand]

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

@@ -70,13 +70,24 @@
                             <Grid>
 
                                 <!--  Volumn: 0  -->
-                                <FontIcon
-                                    x:Name="VolumeLevel0"
-                                    FontFamily="{StaticResource IconFontFamily}"
-                                    Glyph="&#xE74F;">
+                                <FontIcon FontFamily="{StaticResource IconFontFamily}" Glyph="&#xE74F;">
                                     <FontIcon.OpacityTransition>
                                         <ScalarTransition />
                                     </FontIcon.OpacityTransition>
+                                    <interactivity:Interaction.Behaviors>
+                                        <interactivity:DataTriggerBehavior
+                                            Binding="{x:Bind ViewModel.Volume, Mode=OneWay}"
+                                            ComparisonCondition="Equal"
+                                            Value="0">
+                                            <interactivity:ChangePropertyAction PropertyName="Opacity" Value="1" />
+                                        </interactivity:DataTriggerBehavior>
+                                        <interactivity:DataTriggerBehavior
+                                            Binding="{x:Bind ViewModel.Volume, Mode=OneWay}"
+                                            ComparisonCondition="NotEqual"
+                                            Value="0">
+                                            <interactivity:ChangePropertyAction PropertyName="Opacity" Value="0" />
+                                        </interactivity:DataTriggerBehavior>
+                                    </interactivity:Interaction.Behaviors>
                                 </FontIcon>
 
                                 <!--  Volumn: 1-32  -->
@@ -87,6 +98,20 @@
                                     <FontIcon.OpacityTransition>
                                         <ScalarTransition />
                                     </FontIcon.OpacityTransition>
+                                    <interactivity:Interaction.Behaviors>
+                                        <interactivity:DataTriggerBehavior
+                                            Binding="{x:Bind ViewModel.Volume, Mode=OneWay}"
+                                            ComparisonCondition="GreaterThanOrEqual"
+                                            Value="1">
+                                            <interactivity:ChangePropertyAction PropertyName="Opacity" Value="1" />
+                                        </interactivity:DataTriggerBehavior>
+                                        <interactivity:DataTriggerBehavior
+                                            Binding="{x:Bind ViewModel.Volume, Mode=OneWay}"
+                                            ComparisonCondition="LessThan"
+                                            Value="1">
+                                            <interactivity:ChangePropertyAction PropertyName="Opacity" Value="0" />
+                                        </interactivity:DataTriggerBehavior>
+                                    </interactivity:Interaction.Behaviors>
                                 </FontIcon>
 
                                 <!--  Volumn: 33-65  -->
@@ -97,6 +122,20 @@
                                     <FontIcon.OpacityTransition>
                                         <ScalarTransition />
                                     </FontIcon.OpacityTransition>
+                                    <interactivity:Interaction.Behaviors>
+                                        <interactivity:DataTriggerBehavior
+                                            Binding="{x:Bind ViewModel.Volume, Mode=OneWay}"
+                                            ComparisonCondition="GreaterThanOrEqual"
+                                            Value="33">
+                                            <interactivity:ChangePropertyAction PropertyName="Opacity" Value="1" />
+                                        </interactivity:DataTriggerBehavior>
+                                        <interactivity:DataTriggerBehavior
+                                            Binding="{x:Bind ViewModel.Volume, Mode=OneWay}"
+                                            ComparisonCondition="LessThan"
+                                            Value="33">
+                                            <interactivity:ChangePropertyAction PropertyName="Opacity" Value="0" />
+                                        </interactivity:DataTriggerBehavior>
+                                    </interactivity:Interaction.Behaviors>
                                 </FontIcon>
 
                                 <!--  Volumn: 66-100  -->
@@ -107,6 +146,20 @@
                                     <FontIcon.OpacityTransition>
                                         <ScalarTransition />
                                     </FontIcon.OpacityTransition>
+                                    <interactivity:Interaction.Behaviors>
+                                        <interactivity:DataTriggerBehavior
+                                            Binding="{x:Bind ViewModel.Volume, Mode=OneWay}"
+                                            ComparisonCondition="GreaterThanOrEqual"
+                                            Value="66">
+                                            <interactivity:ChangePropertyAction PropertyName="Opacity" Value="1" />
+                                        </interactivity:DataTriggerBehavior>
+                                        <interactivity:DataTriggerBehavior
+                                            Binding="{x:Bind ViewModel.Volume, Mode=OneWay}"
+                                            ComparisonCondition="LessThan"
+                                            Value="66">
+                                            <interactivity:ChangePropertyAction PropertyName="Opacity" Value="0" />
+                                        </interactivity:DataTriggerBehavior>
+                                    </interactivity:Interaction.Behaviors>
                                 </FontIcon>
                             </Grid>
 
@@ -343,65 +396,5 @@
 
         <uc:SystemTray />
 
-        <VisualStateManager.VisualStateGroups>
-            <VisualStateGroup x:Name="VolumeState">
-                <VisualState x:Name="Volume0">
-                    <VisualState.StateTriggers>
-                        <ui:CompareStateTrigger
-                            Comparison="Equal"
-                            Value="{x:Bind ViewModel.Volume, Mode=OneWay}"
-                            To="0" />
-                    </VisualState.StateTriggers>
-                    <VisualState.Setters>
-                        <Setter Target="VolumeLevel0.Opacity" Value="1" />
-                        <Setter Target="VolumeLevel1.Opacity" Value="0" />
-                        <Setter Target="VolumeLevel2.Opacity" Value="0" />
-                        <Setter Target="VolumeLevel3.Opacity" Value="0" />
-                    </VisualState.Setters>
-                </VisualState>
-                <VisualState x:Name="Volume1">
-                    <VisualState.StateTriggers>
-                        <ui:CompareStateTrigger
-                            Comparison="LessThanOrEqual"
-                            Value="{x:Bind ViewModel.Volume, Mode=OneWay}"
-                            To="32" />
-                    </VisualState.StateTriggers>
-                    <VisualState.Setters>
-                        <Setter Target="VolumeLevel0.Opacity" Value="0" />
-                        <Setter Target="VolumeLevel1.Opacity" Value="1" />
-                        <Setter Target="VolumeLevel2.Opacity" Value="0" />
-                        <Setter Target="VolumeLevel3.Opacity" Value="0" />
-                    </VisualState.Setters>
-                </VisualState>
-                <VisualState x:Name="Volume2">
-                    <VisualState.StateTriggers>
-                        <ui:CompareStateTrigger
-                            Comparison="LessThanOrEqual"
-                            Value="{x:Bind ViewModel.Volume, Mode=OneWay}"
-                            To="65" />
-                    </VisualState.StateTriggers>
-                    <VisualState.Setters>
-                        <Setter Target="VolumeLevel0.Opacity" Value="0" />
-                        <Setter Target="VolumeLevel1.Opacity" Value="0" />
-                        <Setter Target="VolumeLevel2.Opacity" Value="1" />
-                        <Setter Target="VolumeLevel3.Opacity" Value="0" />
-                    </VisualState.Setters>
-                </VisualState>
-                <VisualState x:Name="Volume3">
-                    <VisualState.StateTriggers>
-                        <ui:CompareStateTrigger
-                            Comparison="LessThanOrEqual"
-                            Value="{x:Bind ViewModel.Volume, Mode=OneWay}"
-                            To="100" />
-                    </VisualState.StateTriggers>
-                    <VisualState.Setters>
-                        <Setter Target="VolumeLevel0.Opacity" Value="0" />
-                        <Setter Target="VolumeLevel1.Opacity" Value="0" />
-                        <Setter Target="VolumeLevel2.Opacity" Value="0" />
-                        <Setter Target="VolumeLevel3.Opacity" Value="1" />
-                    </VisualState.Setters>
-                </VisualState>
-            </VisualStateGroup>
-        </VisualStateManager.VisualStateGroups>
     </Grid>
 </Page>

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

@@ -18,7 +18,7 @@
             Width="1"
             Height="1"
             HorizontalAlignment="Left"
-            VerticalAlignment="Top" />
+            VerticalAlignment="Bottom" />
 
         <local:LyricsPage />
 

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

@@ -87,7 +87,7 @@ namespace BetterLyrics.WinUI3.Views
         {
             if (_liveStatesService.LiveStates.IsLyricsWindowStatusRefreshing)
             {
-                //return;
+                return;
             }
 
             if (args.DidPositionChange || args.DidSizeChange)

README.CN.md

@@ -89,7 +89,7 @@ BetterLyrics
 - 🧠 **智能化行为**
   - 根据歌曲播放状态自动显隐歌词窗口
 
-## 屏幕截图
+## 🖼️ 屏幕截图
 
 ![](Screenshots/fs2.png)
 ![](Screenshots/std.png)
@@ -104,11 +104,11 @@ BetterLyrics
 ![](Screenshots/PixPin_2025-10-24_18-13-44.gif)
 ![](Screenshots/PixPin_2025-10-24_18-17-17.gif)
 
-## 演示
+## 📹 演示
 
 在 [哔哩哔哩](https://www.bilibili.com/video/BV1QRstz1EGt/) 上观看于 2025 年 10 月 21 日上传的演示视频。
 
-## 即刻体验
+## 🧪 即刻体验
 
 <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"/>
@@ -116,14 +116,33 @@ BetterLyrics
 
 **无限期**免费试用版和付费版**无任何区别**。
 
-☕ 如果喜欢该软件，请考虑 [捐赠](#捐赠) 或在 **Microsoft Store** 🧧 购买, 感谢您的支持！ 🥰
+如果喜欢该软件，请考虑 [捐赠](#-捐赠) 或在 **Microsoft Store** 购买, 感谢您的支持！ 🥰
 
 无法从 Microsoft Store 下载？点按 [此处](https://github.com/jayfunc/BetterLyrics/wiki/%5BZH%5D-%E5%85%B6%E4%BB%96%E4%B8%8B%E8%BD%BD%E5%92%8C%E5%AE%89%E8%A3%85%E6%96%B9%E5%BC%8F) 查看其他下载安装方式。
 
-## 构建
+## 🏗️ 构建
 
 在构建之前确保替换文件 `BetterLyrics\BetterLyrics.WinUI3\BetterLyrics.WinUI3\Constants\LastFMTemplate` 为 `BetterLyrics\BetterLyrics.WinUI3\BetterLyrics.WinUI3\Constants\LastFM.cs`。
 
+## 🤑 捐赠
+
+如果你喜欢本应用，请考虑捐赠支持开发者。这将有助于本应用的长远发展。
+
+通过以下途径捐赠：
+- [PayPal](https://paypal.me/zhefangpay)
+- [Buy Me a Coffee](https://buymeacoffee.com/founchoo)
+- <details><summary>支付宝</summary>
+    
+  ![](Donate/Alipay.jpg)
+  
+  </detais>
+
+- <details><summary>微信</summary>
+    
+  ![](Donate/WeChatReward.png)
+  
+  </details>
+
 ## 💖 感谢
 
 部分功能及代码引用或修改自公开资料库，包括但不限于下述开源项目/包、教程等，在此一并感谢。
@@ -169,39 +188,26 @@ BetterLyrics
 
 现在访问 https://crowdin.com/project/betterlyrics/invite?h=c9bfb28fce061484883c0891e7a26f9b2592556 即刻为本应用提供翻译，成为贡献者！
 
-## 星标记录
+## ⭐ 星标记录
 
 <div style="display: flex; justify-content: space-around; align-items: flex-start;">
   <img src="https://api.star-history.com/svg?repos=jayfunc/BetterLyrics&type=Date)](https://www.star-history.com/#jayfunc/BetterLyrics&Date" width="100%" >
 </div>
 
-## 欢迎反馈问题、提交代码
+## 🤗 欢迎反馈问题、提交代码
 
 如果发现 Bug 请在 Issues 内提出，同时也欢迎任何想法、建议。
 
-## 捐赠
-
-如果你喜欢本应用，请考虑捐赠支持开发者。这将有助于本应用的长远发展。
-
-通过以下途径捐赠：
-- [PayPal](https://paypal.me/zhefangpay)
-- [Buy Me a Coffee](https://buymeacoffee.com/founchoo)
-- <details><summary>支付宝</summary>
-    
-  ![](Donate/Alipay.jpg)
-  
-  </detais>
-
-- <details><summary>微信</summary>
-    
-  ![](Donate/WeChatReward.png)
-  
-  </details>
-
 ## ⚠️ 免责声明
 
 本项目按“原样”提供，不提供任何形式的担保。
 所有歌词、字体、图标及其他第三方资源均为其各自版权所有者的财产。
 本项目作者不主张对这些资源的所有权。
 本项目为非商业用途，不得用于侵犯任何权利。
-用户有责任确保其使用符合适用的法律和许可协议。
+用户有责任确保其使用符合适用的法律和许可协议。
+
+## 💭 社交媒体分享
+
+![BetterLyrics](https://socialify.git.ci/jayfunc/BetterLyrics/image?description=1&forks=1&issues=1&language=1&name=1&owner=1&pulls=1&stargazers=1&theme=Light)
+
+![BetterLyrics](https://opengraph.githubassets.com/<any_hash_number>/jayfunc/BetterLyrics)

README.md

@@ -95,7 +95,7 @@ Check out the article: [BetterLyrics – An immersive and smooth lyrics display
 - 🧠 **Smart Behaviors**
   - Auto hide when music paused
 
-## Screenshots
+## 🖼️ Screenshots
 
 ![](Screenshots/fs2.png)
 ![](Screenshots/std.png)
@@ -110,11 +110,11 @@ Check out the article: [BetterLyrics – An immersive and smooth lyrics display
 ![](Screenshots/PixPin_2025-10-24_18-13-44.gif)
 ![](Screenshots/PixPin_2025-10-24_18-17-17.gif)
 
-## Demonstration
+## 📹 Demonstration
 
 Watch our demo video (uploaded on 21 Oct 2025) on Bilibili [here](https://www.bilibili.com/video/BV1QRstz1EGt/).
 
-## Try it now
+## 🧪 Try it now
 
 <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"/>
@@ -122,14 +122,33 @@ Watch our demo video (uploaded on 21 Oct 2025) on Bilibili [here](https://www.bi
 
 **Unlimited** free trail or purchase (there is **no difference** between free and paid version).
 
-☕ If you find it useful, please consider [donating](#donations) or purchasing 🧧 it in **Microsoft Store**, I'll appreciate it! 🥰
+If you find it useful, please consider [donating](#-donations) or purchasing it in **Microsoft Store**, I'll appreciate it! 🥰
 
 Having trouble downloading and installing from the MS Store? See the alternative way to install it [here](https://github.com/jayfunc/BetterLyrics/wiki/%5BEN%5D-Alternative-way-to-download-and-install). 
 
-## Build
+## 🏗️ Build
 
 Before you build, make sure that you have already replaced `BetterLyrics\BetterLyrics.WinUI3\BetterLyrics.WinUI3\Constants\LastFMTemplate` with `BetterLyrics\BetterLyrics.WinUI3\BetterLyrics.WinUI3\Constants\LastFM.cs`.
 
+## 🤑 Donations
+
+If you like this project, please consider supporting it by donating. Your support will help keep the project alive and encourage further development.
+
+You can donate via:
+- [PayPal](https://paypal.me/zhefangpay)
+- [Buy Me a Coffee](https://buymeacoffee.com/founchoo)
+- <details><summary>支付宝</summary>
+    
+  ![](Donate/Alipay.jpg)
+  
+  </detais>
+
+- <details><summary>微信</summary>
+    
+  ![](Donate/WeChatReward.png)
+  
+  </details>
+
 ## 💖 Many thanks to
 
 Some functions and code are referenced or modified from public repositories, including but not limited to the following open source projects/packages, tutorials, etc., and we would like to express our gratitude to them here.
@@ -175,35 +194,16 @@ Cannot find your language? Or have better translations? Don't worry! Start trans
 
 Visit https://crowdin.com/project/betterlyrics/invite?h=c9bfb28fce061484883c0891e7a26f9b2592556 to accept the invitation and become a valuable translator now!
 
-## Star history
+## ⭐ Star history
 
 <div style="display: flex; justify-content: space-around; align-items: flex-start;">
   <img src="https://api.star-history.com/svg?repos=jayfunc/BetterLyrics&type=Date)](https://www.star-history.com/#jayfunc/BetterLyrics&Date" width="100%" >
 </div>
 
-## Any issues and PRs are welcome
+## 🤗 Any issues and PRs are welcome
 
 If you find a bug, please file it in issues, or if you have any ideas, feel free to share them here.
 
-## Donations
-
-If you like this project, please consider supporting it by donating. Your support will help keep the project alive and encourage further development.
-
-You can donate via:
-- [PayPal](https://paypal.me/zhefangpay)
-- [Buy Me a Coffee](https://buymeacoffee.com/founchoo)
-- <details><summary>支付宝</summary>
-    
-  ![](Donate/Alipay.jpg)
-  
-  </detais>
-
-- <details><summary>微信</summary>
-    
-  ![](Donate/WeChatReward.png)
-  
-  </details>
-
 ## ⚠️ Disclaimer
 
 This project is provided "as is" without warranty of any kind.
@@ -213,3 +213,9 @@ The author of this project does not claim ownership of such resources.
 
 This project is non-commercial and should not be used to infringe any rights. 
 Users are responsible for ensuring their own use complies with applicable laws and licenses.
+
+## 💭 Share it on social media
+
+![BetterLyrics](https://socialify.git.ci/jayfunc/BetterLyrics/image?description=1&forks=1&issues=1&language=1&name=1&owner=1&pulls=1&stargazers=1&theme=Light)
+
+![BetterLyrics](https://opengraph.githubassets.com/<any_hash_number>/jayfunc/BetterLyrics)