fix: settings storage issue

Author: jayfunc

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

@@ -52,7 +52,61 @@ public partial class LyricsWindowStatus : ObservableRecipient, ICloneable
 
         public LyricsWindowStatus()
         {
+        }
+
+        partial void OnLyricsStyleSettingsChanged(LyricsStyleSettings oldValue, LyricsStyleSettings newValue)
+        {
+            oldValue.PropertyChanged -= LyricsStyleSettings_PropertyChanged;
+            newValue.PropertyChanged += LyricsStyleSettings_PropertyChanged;
+        }
 
+        private void LyricsStyleSettings_PropertyChanged(object? sender, System.ComponentModel.PropertyChangedEventArgs e)
+        {
+            OnPropertyChanged(nameof(LyricsStyleSettings));
+        }
+
+        partial void OnLyricsEffectSettingsChanged(LyricsEffectSettings oldValue, LyricsEffectSettings newValue)
+        {
+            oldValue.PropertyChanged -= LyricsEffectSettings_PropertyChanged;
+            newValue.PropertyChanged += LyricsEffectSettings_PropertyChanged;
+        }
+
+        private void LyricsEffectSettings_PropertyChanged(object? sender, System.ComponentModel.PropertyChangedEventArgs e)
+        {
+            OnPropertyChanged(nameof(LyricsEffectSettings));
+        }
+
+        partial void OnLyricsBackgroundSettingsChanged(LyricsBackgroundSettings oldValue, LyricsBackgroundSettings newValue)
+        {
+            oldValue.PropertyChanged -= LyricsBackgroundSettings_PropertyChanged;
+            newValue.PropertyChanged += LyricsBackgroundSettings_PropertyChanged;
+        }
+
+        private void LyricsBackgroundSettings_PropertyChanged(object? sender, System.ComponentModel.PropertyChangedEventArgs e)
+        {
+            OnPropertyChanged(nameof(LyricsBackgroundSettings));
+        }
+
+        partial void OnAlbumArtLayoutSettingsChanged(AlbumArtAreaStyleSettings oldValue, AlbumArtAreaStyleSettings newValue)
+        {
+            oldValue.PropertyChanged -= AlbumArtLayoutSettings_PropertyChanged;
+            newValue.PropertyChanged += AlbumArtLayoutSettings_PropertyChanged;
+        }
+
+        private void AlbumArtLayoutSettings_PropertyChanged(object? sender, System.ComponentModel.PropertyChangedEventArgs e)
+        {
+            OnPropertyChanged(nameof(AlbumArtLayoutSettings));
+        }
+
+        partial void OnAlbumArtAreaEffectSettingsChanged(AlbumArtAreaEffectSettings oldValue, AlbumArtAreaEffectSettings newValue)
+        {
+            oldValue.PropertyChanged -= AlbumArtAreaEffectSettings_PropertyChanged;
+            newValue.PropertyChanged += AlbumArtAreaEffectSettings_PropertyChanged;
+        }
+
+        private void AlbumArtAreaEffectSettings_PropertyChanged(object? sender, System.ComponentModel.PropertyChangedEventArgs e)
+        {
+            OnPropertyChanged(nameof(AlbumArtAreaEffectSettings));
         }
 
         public LyricsWindowStatus(Window? targetWindow = null)

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Renderer/LyricsRenderer.cs

@@ -146,17 +146,19 @@ private void DrawLyrics(
                 if (line.OriginalCanvasTextLayout == null) continue;
                 if (line.OriginalCanvasTextLayout.LayoutBounds.Width <= 0) continue;
 
-                var rotationY = line.CenterPosition.Y;
-
-                double xOffset = lyricsX + Math.Abs(line.AngleTransition.Value) / (Math.PI / 2) * lyricsWidth / 2 * (effectSettings.FanLyricsAngle < 0 ? 1 : -1);
+                double xOffset = lyricsX;
                 double yOffset = line.YOffsetTransition.Value + userScrollOffset + lyricsY + lyricsHeight * playingLineTopOffsetFactor;
 
-                var transform =
-                    Matrix3x2.CreateScale((float)line.ScaleTransition.Value, line.CenterPosition) *
-                    Matrix3x2.CreateRotation((float)line.AngleTransition.Value, new Vector2((float)rotationX, rotationY)) *
-                    Matrix3x2.CreateTranslation((float)xOffset, (float)yOffset);
+                ds.Transform = Matrix3x2.CreateScale((float)line.ScaleTransition.Value, line.CenterPosition);
+
+                if (effectSettings.IsFanLyricsEnabled)
+                {
+                    xOffset += Math.Abs(line.AngleTransition.Value) / (Math.PI / 2) * lyricsWidth / 2 * (effectSettings.FanLyricsAngle < 0 ? 1 : -1);
+                    var rotationY = line.CenterPosition.Y;
+                    ds.Transform *= Matrix3x2.CreateRotation((float)line.AngleTransition.Value, new Vector2((float)rotationX, rotationY));
+                }
 
-                ds.Transform = transform;
+                ds.Transform *= Matrix3x2.CreateTranslation((float)xOffset, (float)yOffset);
 
                 using (var textOnlyLayer = RenderBaseTextLayer(control, line, styleSettings.LyricsFontStrokeWidth, strokeColor, line.ColorTransition.Value))
                 {