fix: song timeline offset, lyrics scroll overlay offset

Author: jayfunc

BetterLyrics.WinUI3/BetterLyrics.WinUI3/App.xaml.cs

@@ -25,6 +25,7 @@
 using System.Threading;
 using System.Threading.Tasks;
 using Vanara.PInvoke;
+using WinUIEx;
 
 namespace BetterLyrics.WinUI3
 {
@@ -68,6 +69,10 @@ private void EnsureSingleInstance()
 
         protected override void OnLaunched(LaunchActivatedEventArgs args)
         {
+            // 设置托盘
+            WindowHook.OpenOrShowWindow<SystemTrayWindow>();
+            WindowHook.HideWindow<SystemTrayWindow>();
+
             WindowHook.OpenOrShowWindow<NowPlayingWindow>();
             if (Ioc.Default.GetRequiredService<ISettingsService>().AppSettings.MusicGallerySettings.AutoOpen)
             {
@@ -109,11 +114,13 @@ private static void ConfigureServices()
                     .AddSingleton<LyricsWindowSettingsControlViewModel>()
                     .AddSingleton<LyricsWindowSwitchControlViewModel>()
                     .AddSingleton<LyricsWindowSwitchWindowViewModel>()
+                    
                     .AddSingleton<NowPlayingWindowViewModel>()
+                    .AddSingleton<NowPlayingPageViewModel>()
+
                     .AddSingleton<SettingsWindowViewModel>()
                     .AddSingleton<SystemTrayViewModel>()
                     .AddSingleton<SettingsPageViewModel>()
-                    .AddSingleton<NowPlayingPageViewModel>()
                     .AddSingleton<MusicGalleryViewModel>()
                     .AddSingleton<AboutControlViewModel>()
                     .BuildServiceProvider()

BetterLyrics.WinUI3/BetterLyrics.WinUI3/BetterLyrics.WinUI3.csproj

@@ -44,6 +44,7 @@
 		<None Remove="Views\MusicGalleryPage.xaml" />
 		<None Remove="Views\MusicGalleryWindow.xaml" />
 		<None Remove="Views\SettingsWindow.xaml" />
+		<None Remove="Views\SystemTrayWindow.xaml" />
 	</ItemGroup>
 	<ItemGroup>
 		<Content Include="Logo.ico" />
@@ -67,10 +68,10 @@
 		<PackageReference Include="ComputeSharp.D2D1.WinUI" Version="3.2.0" />
 		<PackageReference Include="csharp-kana" Version="1.0.2" />
 		<PackageReference Include="csharp-pinyin" Version="1.0.1" />
-		<PackageReference Include="DevWinUI.Controls" Version="9.6.0" />
+		<PackageReference Include="DevWinUI.Controls" Version="9.7.0" />
 		<PackageReference Include="Dubya.WindowsMediaController" Version="2.5.5" />
-		<PackageReference Include="F23.StringSimilarity" Version="7.0.0" />
-		<PackageReference Include="H.NotifyIcon.WinUI" Version="2.3.2" />
+		<PackageReference Include="F23.StringSimilarity" Version="7.0.1" />
+		<PackageReference Include="H.NotifyIcon.WinUI" Version="2.4.1" />
 		<PackageReference Include="Hqub.Last.fm" Version="2.5.1" />
 		<PackageReference Include="Lyricify.Lyrics.Helper-NativeAot" Version="0.1.4-alpha.5" />
 		<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="10.0.0" />
@@ -336,6 +337,11 @@
 	<ItemGroup>
 	  <Folder Include="TemplateSelector\" />
 	</ItemGroup>
+	<ItemGroup>
+	  <Page Update="Views\SystemTrayWindow.xaml">
+	    <Generator>MSBuild:Compile</Generator>
+	  </Page>
+	</ItemGroup>
 	<ItemGroup>
 	  <Page Update="Controls\WindowSettingsControl.xaml">
 	    <Generator>MSBuild:Compile</Generator>

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Controls/LyricsCanvas.xaml.cs

@@ -19,6 +19,7 @@
 using Microsoft.UI.Xaml;
 using Microsoft.UI.Xaml.Controls;
 using System;
+using System.Collections.Generic;
 using System.Linq;
 using System.Numerics;
 using Windows.Foundation;
@@ -96,6 +97,7 @@ public sealed partial class LyricsCanvas : UserControl,
             easingType: EasingType.EaseInOutSine
         );
 
+        private TimeSpan _songPositionWithOffset;
         private TimeSpan _songPosition; // 当前歌曲时刻
         private TimeSpan _totalPlayedTime; // 当前歌曲播放总时长（包括来来回回重复播放的时间）
         private bool _isLastFMTracked = false;
@@ -112,7 +114,7 @@ public sealed partial class LyricsCanvas : UserControl,
         private bool _isMousePressing = false;
         private bool _isMouseScrolling = false;
 
-        private LyricsData? _lyricsData;
+        private List<RenderLyricsLine>? _renderLyricsLines = null;
 
         private bool _isLayoutChanged = true;
         private bool _isMouseScrollingChanged = false;
@@ -123,7 +125,7 @@ public sealed partial class LyricsCanvas : UserControl,
 
         public TimeSpan SongPosition => _songPosition;
         public double CurrentCanvasYScroll => _canvasYScrollTransition.Value;
-        public double ActualLyricsHeight => LyricsLayoutManager.CalculateActualHeight(_lyricsData?.LyricsLines);
+        public double ActualLyricsHeight => LyricsLayoutManager.CalculateActualHeight(_renderLyricsLines);
         public int CurrentHoveringLineIndex => _mouseHoverLineIndex;
 
         // 歌词区域起始横 X 坐标
@@ -316,8 +318,6 @@ private void Canvas_Draw(ICanvasAnimatedControl sender, CanvasAnimatedDrawEventA
             double songDuration = _mediaSessionsService.CurrentSongInfo?.DurationMs ?? 0;
             bool isForceWordByWord = _settingsService.AppSettings.GeneralSettings.IsForceWordByWordEffect;
 
-            double fixedSongPositionMs = _songPosition.TotalMilliseconds + (_mediaSessionsService.CurrentMediaSourceProviderInfo?.PositionOffset ?? 0);
-
             var lyricsThemeColors = _mediaSessionsService.AlbumArtThemeColors;
 
             Color overlayColor;
@@ -355,7 +355,7 @@ private void Canvas_Draw(ICanvasAnimatedControl sender, CanvasAnimatedDrawEventA
             _lyricsRenderer.Draw(
                 control: sender,
                 ds: args.DrawingSession,
-                lyricsData: _lyricsData,
+                lines: _renderLyricsLines,
                 playingLineIndex: _playingLineIndex,
                 mouseHoverLineIndex: _mouseHoverLineIndex,
                 isMousePressing: _isMousePressing,
@@ -374,15 +374,15 @@ private void Canvas_Draw(ICanvasAnimatedControl sender, CanvasAnimatedDrawEventA
                 fgColor: lyricsThemeColors.FgFontColor,
                 getPlaybackState: (lineIndex) =>
                 {
-                    if (_lyricsData == null) return new LinePlaybackState();
+                    if (_renderLyricsLines == null) return new LinePlaybackState();
 
-                    var line = _lyricsData.LyricsLines.ElementAtOrDefault(lineIndex);
+                    var line = _renderLyricsLines.ElementAtOrDefault(lineIndex);
                     if (line == null) return new LinePlaybackState();
 
-                    var nextLine = _lyricsData.LyricsLines.ElementAtOrDefault(lineIndex + 1);
+                    var nextLine = _renderLyricsLines.ElementAtOrDefault(lineIndex + 1);
 
                     return _synchronizer.GetLinePlayingProgress(
-                        fixedSongPositionMs,
+                        _songPositionWithOffset.TotalMilliseconds,
                         line,
                         nextLine,
                         songDuration,
@@ -411,12 +411,12 @@ private void Canvas_Draw(ICanvasAnimatedControl sender, CanvasAnimatedDrawEventA
             args.DrawingSession.DrawText(
                     $"Lyrics render start pos: ({(int)_renderLyricsStartX}, {(int)_renderLyricsStartY})\n" +
                     $"Lyrics render size: [{(int)_renderLyricsWidth} x {(int)_renderLyricsHeight}]\n" +
-                    $"Lyrics actual height: {LyricsLayoutManager.CalculateActualHeight(_lyricsData?.LyricsLines)}\n" +
+                    $"Lyrics actual height: {LyricsLayoutManager.CalculateActualHeight(_renderLyricsLines)}\n" +
                     $"Playing line (idx): {_playingLineIndex}\n" +
                     $"Mouse hovering line (idx): {_mouseHoverLineIndex}\n" +
                     $"Visible lines range (idx): [{_visibleRange.Start}, {_visibleRange.End}]\n" +
-                    $"Total line count: {LyricsLayoutManager.CalculateMaxRange(_lyricsData?.LyricsLines).End + 1}\n" +
-                    $"Played: {TimeSpan.FromMilliseconds(fixedSongPositionMs)} / {TimeSpan.FromMilliseconds(_mediaSessionsService.CurrentSongInfo?.DurationMs ?? 0)}\n" +
+                    $"Total line count: {LyricsLayoutManager.CalculateMaxRange(_renderLyricsLines).End + 1}\n" +
+                    $"Played: {_songPosition} / {TimeSpan.FromMilliseconds(_mediaSessionsService.CurrentSongInfo?.DurationMs ?? 0)}\n" +
                     $"Y offset: {_canvasYScrollTransition.Value}\n" +
                     $"User scroll offset: {_mouseYScrollTransition.Value}",
                 new Vector2(0, 0), Colors.Red);
@@ -430,6 +430,7 @@ private void Canvas_Update(ICanvasAnimatedControl sender, CanvasAnimatedUpdateEv
             var lyricsStyle = _liveStatesService.LiveStates.LyricsWindowStatus.LyricsStyleSettings;
             var lyricsEffect = _liveStatesService.LiveStates.LyricsWindowStatus.LyricsEffectSettings;
             var albumArtThemeColors = _mediaSessionsService.AlbumArtThemeColors;
+            var lyricsData = _mediaSessionsService.CurrentLyricsData;
 
             TimeSpan elapsedTime = args.Timing.ElapsedTime;
 
@@ -447,7 +448,7 @@ private void Canvas_Update(ICanvasAnimatedControl sender, CanvasAnimatedUpdateEv
 
             #region UpdatePlayingLineIndex
 
-            int newPlayingIndex = _synchronizer.GetCurrentLineIndex(_songPosition.TotalMilliseconds, _lyricsData);
+            int newPlayingIndex = _synchronizer.GetCurrentLineIndex(_songPositionWithOffset.TotalMilliseconds, lyricsData);
             bool isPlayingLineChanged = newPlayingIndex != _playingLineIndex;
             _playingLineIndex = newPlayingIndex;
 
@@ -457,7 +458,7 @@ private void Canvas_Update(ICanvasAnimatedControl sender, CanvasAnimatedUpdateEv
 
             if (isPlayingLineChanged || _isLayoutChanged)
             {
-                var targetScroll = LyricsLayoutManager.CalculateTargetScrollOffset(_lyricsData, _playingLineIndex);
+                var targetScroll = LyricsLayoutManager.CalculateTargetScrollOffset(_renderLyricsLines, _playingLineIndex);
                 if (targetScroll.HasValue) _canvasTargetScrollOffset = targetScroll.Value;
 
                 _canvasYScrollTransition.SetEasingType(lyricsEffect.LyricsScrollEasingType);
@@ -471,7 +472,7 @@ private void Canvas_Update(ICanvasAnimatedControl sender, CanvasAnimatedUpdateEv
             _mouseYScrollTransition.Update(elapsedTime);
 
             _mouseHoverLineIndex = LyricsLayoutManager.FindMouseHoverLineIndex(
-                _lyricsData?.LyricsLines,
+                _renderLyricsLines,
                 _isMouseInLyricsArea,
                 _mousePosition,
                 _canvasYScrollTransition.Value + _mouseYScrollTransition.Value,
@@ -481,18 +482,18 @@ private void Canvas_Update(ICanvasAnimatedControl sender, CanvasAnimatedUpdateEv
             );
 
             _visibleRange = LyricsLayoutManager.CalculateVisibleRange(
-                _lyricsData?.LyricsLines,
+                _renderLyricsLines,
                 _canvasYScrollTransition.Value + _mouseYScrollTransition.Value, // 当前滚动位置
                 _renderLyricsStartY,
                 _renderLyricsHeight,
                 sender.Size.Height,
                 lyricsStyle.PlayingLineTopOffset / 100.0
             );
 
-            var maxRange = LyricsLayoutManager.CalculateMaxRange(_lyricsData?.LyricsLines);
+            var maxRange = LyricsLayoutManager.CalculateMaxRange(_renderLyricsLines);
 
             _animator.UpdateLines(
-                _lyricsData,
+                _renderLyricsLines,
                 _isMouseScrolling ? maxRange.Start : _visibleRange.Start,
                 _isMouseScrolling ? maxRange.End : _visibleRange.End,
                 _playingLineIndex,
@@ -591,11 +592,11 @@ private void DisposeAnalyzer()
 
         private void TriggerRelayout()
         {
-            if (_lyricsData == null || !_isLayoutChanged) return;
+            if (_renderLyricsLines == null || !_isLayoutChanged) return;
 
             LyricsLayoutManager.MeasureAndArrange(
                 resourceCreator: Canvas,
-                lyricsData: _lyricsData,
+                lines: _renderLyricsLines,
                 status: _liveStatesService.LiveStates.LyricsWindowStatus,
                 appSettings: _settingsService.AppSettings,
                 canvasWidth: Canvas.Size.Width,
@@ -611,6 +612,7 @@ private void UpdatePlaybackState(TimeSpan elapsedTime)
             {
                 _songPosition += elapsedTime;
                 _totalPlayedTime += elapsedTime;
+                _songPositionWithOffset = _songPosition + TimeSpan.FromMilliseconds(_mediaSessionsService.CurrentMediaSourceProviderInfo?.PositionOffset ?? 0);
                 CheckAndScrobbleLastFM();
             }
         }
@@ -632,7 +634,7 @@ private void CheckAndScrobbleLastFM()
 
         private void ResetPlaybackState()
         {
-            _totalPlayedTime = TimeSpan.Zero;
+            _songPosition = TimeSpan.Zero;
             _totalPlayedTime = TimeSpan.Zero;
             _isLastFMTracked = false;
         }
@@ -694,7 +696,19 @@ public void Receive(PropertyChangedMessage<LyricsData?> message)
             {
                 if (message.PropertyName == nameof(IMediaSessionsService.CurrentLyricsData))
                 {
-                    _lyricsData = message.NewValue;
+                    _renderLyricsLines = null;
+                    if (_mediaSessionsService.CurrentLyricsData is LyricsData lyricsData)
+                    {
+                        _renderLyricsLines = lyricsData.LyricsLines.Select(x => new RenderLyricsLine()
+                        {
+                            LyricsSyllables = x.LyricsSyllables,
+                            StartMs = x.StartMs,
+                            EndMs = x.EndMs,
+                            PhoneticText = x.PhoneticText,
+                            OriginalText = x.OriginalText,
+                            TranslatedText = x.TranslatedText
+                        }).ToList();
+                    }
                     _isLayoutChanged = true;
                 }
             }

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Extensions/PointExtensions.cs

@@ -11,6 +11,9 @@ public static class PointExtensions
 
             public Point AddX(double deltaX) => new(point.X + deltaX, point.Y);
             public Point AddY(double deltaY) => new(point.X, point.Y + deltaY);
+
+            public Point WithX(double x) => new(x, point.Y);
+            public Point WithY(double y) => new(point.X, y);
         }
     }
 }

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Hooks/WindowHook.cs

@@ -100,6 +100,7 @@ public static void MinimizeWindow<T>()
         public static void OpenOrShowWindow<T>()
         {
             var window = _activeWindows.Find(w => w is T);
+            //window = null;
             if (window == null)
             {
                 if (typeof(T) == typeof(NowPlayingWindow))
@@ -123,6 +124,10 @@ public static void OpenOrShowWindow<T>()
                 {
                     window = new LyricsWindowSwitchWindow();
                 }
+                else if (typeof(T) == typeof(SystemTrayWindow))
+                {
+                    window = new SystemTrayWindow();
+                }
                 else
                 {
                     throw new ArgumentException("Unsupported window type", nameof(T));

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Logic/LyricsAnimator.cs

@@ -2,6 +2,7 @@
 using BetterLyrics.WinUI3.Models;
 using BetterLyrics.WinUI3.Models.Settings;
 using System;
+using System.Collections.Generic;
 using System.Linq;
 using Windows.UI;
 
@@ -13,7 +14,7 @@ public class LyricsAnimator
         private readonly double _highlightedScale = 1.0f;
 
         public void UpdateLines(
-            LyricsData? lyricsData,
+            IList<RenderLyricsLine>? lines,
             int startIndex,
             int endIndex,
             int playingLineIndex,
@@ -31,14 +32,14 @@ public void UpdateLines(
             bool isMouseScrollingChanged
         )
         {
-            if (lyricsData == null) return;
+            if (lines == null) return;
 
-            var currentPlayingLine = lyricsData.LyricsLines.ElementAtOrDefault(playingLineIndex);
+            var currentPlayingLine = lines.ElementAtOrDefault(playingLineIndex);
             if (currentPlayingLine == null) return;
 
             for (int i = startIndex; i <= endIndex + 1; i++)
             {
-                var line = lyricsData.LyricsLines.ElementAtOrDefault(i);
+                var line = lines.ElementAtOrDefault(i);
                 if (line == null) continue;
 
                 if (isLayoutChanged || isPlayingLineChanged || isMouseScrollingChanged)