diff --git a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Controls/NowPlayingBar.xaml b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Controls/NowPlayingBar.xaml index ee69e10..b3217d2 100644 --- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Controls/NowPlayingBar.xaml +++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Controls/NowPlayingBar.xaml @@ -356,7 +356,7 @@ Padding="8,4" HorizontalAlignment="Left" VerticalAlignment="Top" - Background="{ThemeResource AcrylicInAppFillColorDefaultBrush}" + Background="{ThemeResource LayerOnMicaBaseAltFillColorDefaultBrush}" CornerRadius="6" Opacity="{x:Bind ViewModel.TimelineSliderThumbOpacity, Mode=OneWay}"> diff --git a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Controls/NowPlayingBar.xaml.cs b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Controls/NowPlayingBar.xaml.cs index 8d47653..51223ee 100644 --- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Controls/NowPlayingBar.xaml.cs +++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Controls/NowPlayingBar.xaml.cs @@ -190,7 +190,7 @@ public sealed partial class NowPlayingBar : UserControl, private void TimelineSliderOverlay_PointerEntered(object sender, Microsoft.UI.Xaml.Input.PointerRoutedEventArgs e) { - ViewModel.TimelineSliderThumbOpacity = 0.7f; + ViewModel.TimelineSliderThumbOpacity = 1f; } private void TimelineSliderOverlay_PointerExited(object sender, Microsoft.UI.Xaml.Input.PointerRoutedEventArgs e) diff --git a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Helper/PickerHelper.cs b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Helper/PickerHelper.cs index cc32468..c3f6ec3 100644 --- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Helper/PickerHelper.cs +++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Helper/PickerHelper.cs @@ -1,5 +1,6 @@ using BetterLyrics.WinUI3.Hooks; using DevWinUI; +using Microsoft.UI.Xaml; using System; using System.Collections.Generic; using System.Threading.Tasks; @@ -45,6 +46,12 @@ namespace BetterLyrics.WinUI3.Helper public static async Task PickSaveFileAsync(IDictionary> fileTypeChoices) { var window = WindowHook.GetWindow(); + + return await PickSaveFileAsync(window, fileTypeChoices); + } + + public static async Task PickSaveFileAsync(T? window, IDictionary> fileTypeChoices) + { if (window == null) return null; var picker = new Windows.Storage.Pickers.FileSavePicker(); diff --git a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/ViewModels/NowPlayingPageViewModel.cs b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/ViewModels/NowPlayingPageViewModel.cs index 189c8f9..2bf1e7d 100644 --- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/ViewModels/NowPlayingPageViewModel.cs +++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/ViewModels/NowPlayingPageViewModel.cs @@ -1,10 +1,16 @@ // 2025/6/23 by Zhe Fang +using BetterLyrics.WinUI3.Helper; using BetterLyrics.WinUI3.Hooks; using BetterLyrics.WinUI3.Services.MediaSessionsService; using BetterLyrics.WinUI3.Views; using CommunityToolkit.Mvvm.Input; +using System.Collections.Generic; +using System.Threading.Tasks; +using Windows.Storage; +using Windows.Storage.Streams; +using WinRT.Interop; namespace BetterLyrics.WinUI3.ViewModels { diff --git a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Views/NowPlayingPage.xaml b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Views/NowPlayingPage.xaml index d331a85..2413f72 100644 --- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Views/NowPlayingPage.xaml +++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Views/NowPlayingPage.xaml @@ -74,6 +74,17 @@ ShadowAmount="{x:Bind LyricsWindowStatus.AlbumArtLayoutSettings.CoverImageShadowAmount, Mode=OneWay}" Source="{x:Bind ViewModel.MediaSessionsService.AlbumArtBitmapImage, Mode=OneWay}" SwitchType="{x:Bind LyricsWindowStatus.AlbumArtAreaEffectSettings.ImageSwitchType, Mode=OneWay}" /> + + + + + + + +