diff --git a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Enums/LyricsDisplayType.cs b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Enums/LyricsDisplayType.cs index 8f2020c..d6d651d 100644 --- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Enums/LyricsDisplayType.cs +++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Enums/LyricsDisplayType.cs @@ -7,6 +7,5 @@ namespace BetterLyrics.WinUI3.Enums AlbumArtOnly, LyricsOnly, SplitView, - PlaceholderOnly, } } diff --git a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Strings/en-US/Resources.resw b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Strings/en-US/Resources.resw index 4595dfe..2823045 100644 --- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Strings/en-US/Resources.resw +++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Strings/en-US/Resources.resw @@ -301,7 +301,7 @@ Welcome to BetterLyrics - Hover the mouse over the top or bottom area of ​​the app to display more function options + Click on the top-left button to enable immersive mode, enjoy! No music playing now diff --git a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Strings/ja-JP/Resources.resw b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Strings/ja-JP/Resources.resw index 4ff084e..b26dae4 100644 --- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Strings/ja-JP/Resources.resw +++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Strings/ja-JP/Resources.resw @@ -301,7 +301,7 @@ BetterLyrics へようこそ - マウスをアプリの上または下部の領域にホバリングして、より多くの機能オプションを表示します + 左上ボタンをクリックして、没入型モードを有効にしてください。お楽しみください! 今は音楽が再生されていません diff --git a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Strings/ko-KR/Resources.resw b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Strings/ko-KR/Resources.resw index a51cca9..039284a 100644 --- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Strings/ko-KR/Resources.resw +++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Strings/ko-KR/Resources.resw @@ -301,7 +301,7 @@ Betterlyrics에 오신 것을 환영합니다 - 더 많은 기능 옵션을 표시하려면 앱의 상단 또는 하단 영역 위로 마우스를 가져옵니다. + 왼쪽 버튼을 클릭하여 몰입 형 모드를 활성화하려면 즐기십시오! 지금 음악이 재생되지 않습니다 diff --git a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Strings/zh-CN/Resources.resw b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Strings/zh-CN/Resources.resw index 23fd639..5834421 100644 --- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Strings/zh-CN/Resources.resw +++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Strings/zh-CN/Resources.resw @@ -301,7 +301,7 @@ 欢迎使用 BetterLyrics - 将鼠标悬停在应用程序的顶部或底部区域以显示更多功能选项 + 单击左上角按钮以启用沉浸式模式,尽情享用吧! 当前没有正在播放的音乐 diff --git a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Strings/zh-TW/Resources.resw b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Strings/zh-TW/Resources.resw index 7228fe7..a1715da 100644 --- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Strings/zh-TW/Resources.resw +++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Strings/zh-TW/Resources.resw @@ -301,7 +301,7 @@ 歡迎使用 BetterLyrics - 將鼠標懸停在應用程序的頂部或底部區域以顯示更多功能選項 + 單擊左上角按鈕以啟用沉浸式模式,盡情享用吧! 目前沒有正在播放的音樂 diff --git a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/ViewModels/LyricsRendererViewModel.Ctor.cs b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/ViewModels/LyricsRendererViewModel.Ctor.cs index 69c32e2..8f5d6c7 100644 --- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/ViewModels/LyricsRendererViewModel.Ctor.cs +++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/ViewModels/LyricsRendererViewModel.Ctor.cs @@ -54,6 +54,7 @@ namespace BetterLyrics.WinUI3.ViewModels _defaultOpacity = _settingsService.LyricsBgFontOpacity / 100f; _isLyricsFloatAnimationEnabled = _settingsService.IsLyricsFloatAnimationEnabled; + _displayType = _displayTypeReceived = _settingsService.DisplayType; _libWatcherService.MusicLibraryFilesChanged += LibWatcherService_MusicLibraryFilesChanged; diff --git a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/ViewModels/LyricsRendererViewModel.Update.cs b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/ViewModels/LyricsRendererViewModel.Update.cs index 7a8b61a..684aac0 100644 --- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/ViewModels/LyricsRendererViewModel.Update.cs +++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/ViewModels/LyricsRendererViewModel.Update.cs @@ -92,8 +92,6 @@ namespace BetterLyrics.WinUI3.ViewModels _lyricsXTransition.StartTransition((_canvasWidth - _leftMargin - _middleMargin - _rightMargin) / 2 + _leftMargin + _middleMargin, jumpTo); _albumArtXTransition.StartTransition(_leftMargin + ((_canvasWidth - _leftMargin - _middleMargin - _rightMargin) / 2 - _albumArtSize) / 2, jumpTo); break; - case LyricsDisplayType.PlaceholderOnly: - break; default: break; } diff --git a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/ViewModels/LyricsRendererViewModel.cs b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/ViewModels/LyricsRendererViewModel.cs index 6695deb..0c343d4 100644 --- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/ViewModels/LyricsRendererViewModel.cs +++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/ViewModels/LyricsRendererViewModel.cs @@ -175,8 +175,8 @@ namespace BetterLyrics.WinUI3.ViewModels private LatestOnlyTaskRunner _refreshLyricsRunner = new(); private LatestOnlyTaskRunner _showTranslationsRunner = new(); - private LyricsDisplayType _displayTypeReceived = LyricsDisplayType.PlaceholderOnly; - private LyricsDisplayType _displayType = LyricsDisplayType.PlaceholderOnly; + private LyricsDisplayType _displayTypeReceived; + private LyricsDisplayType _displayType; private int _albumArtBgBlurAmount; private int _albumArtBgOpacity; diff --git a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Views/LyricsPage.xaml b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Views/LyricsPage.xaml index f627fc3..aba274f 100644 --- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Views/LyricsPage.xaml +++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Views/LyricsPage.xaml @@ -32,6 +32,20 @@ + + + + + + + + @@ -322,29 +336,6 @@ - - - - - - - - - - - - - - - - - - - -