diff --git a/src/Desktop/BiliCopilot.UI/BiliCopilot.UI.csproj b/src/Desktop/BiliCopilot.UI/BiliCopilot.UI.csproj index b97a9e07..5b59341c 100644 --- a/src/Desktop/BiliCopilot.UI/BiliCopilot.UI.csproj +++ b/src/Desktop/BiliCopilot.UI/BiliCopilot.UI.csproj @@ -1645,7 +1645,7 @@ False False - False + True True Assets\logo.ico diff --git a/src/Desktop/BiliCopilot.UI/Controls/Core/Player/NativePlayer.cs b/src/Desktop/BiliCopilot.UI/Controls/Core/Player/NativePlayer.cs index 3e030f83..fc23ab47 100644 --- a/src/Desktop/BiliCopilot.UI/Controls/Core/Player/NativePlayer.cs +++ b/src/Desktop/BiliCopilot.UI/Controls/Core/Player/NativePlayer.cs @@ -30,7 +30,14 @@ protected async override void OnControlLoaded() /// protected override void OnApplyTemplate() - => _playerElement = (MediaPlayerElement)GetTemplateChild("PlayerElement"); + { + var rootGrid = GetTemplateChild("RootGrid") as Grid; + _playerElement = new MediaPlayerElement(); + _playerElement.HorizontalAlignment = HorizontalAlignment.Stretch; + _playerElement.VerticalAlignment = VerticalAlignment.Stretch; + _playerElement.AreTransportControlsEnabled = false; + rootGrid.Children.Add(_playerElement); + } /// protected override async void OnViewModelChanged(NativePlayerViewModel? oldValue, NativePlayerViewModel? newValue) diff --git a/src/Desktop/BiliCopilot.UI/Controls/Core/Player/PlayerResources.xaml b/src/Desktop/BiliCopilot.UI/Controls/Core/Player/PlayerResources.xaml index ff2dfb7e..6cad752c 100644 --- a/src/Desktop/BiliCopilot.UI/Controls/Core/Player/PlayerResources.xaml +++ b/src/Desktop/BiliCopilot.UI/Controls/Core/Player/PlayerResources.xaml @@ -91,13 +91,7 @@ - - - + diff --git a/src/Desktop/BiliCopilot.UI/Controls/Search/UserSectionDetailControl.xaml b/src/Desktop/BiliCopilot.UI/Controls/Search/UserSectionDetailControl.xaml index 121dce2b..9617801a 100644 --- a/src/Desktop/BiliCopilot.UI/Controls/Search/UserSectionDetailControl.xaml +++ b/src/Desktop/BiliCopilot.UI/Controls/Search/UserSectionDetailControl.xaml @@ -18,7 +18,7 @@ - + diff --git a/src/Desktop/BiliCopilot.UI/ViewModels/Core/NativePlayerViewModel/NativePlayerViewModel.Overrides.cs b/src/Desktop/BiliCopilot.UI/ViewModels/Core/NativePlayerViewModel/NativePlayerViewModel.Overrides.cs index fc8c5a45..36a2a61a 100644 --- a/src/Desktop/BiliCopilot.UI/ViewModels/Core/NativePlayerViewModel/NativePlayerViewModel.Overrides.cs +++ b/src/Desktop/BiliCopilot.UI/ViewModels/Core/NativePlayerViewModel/NativePlayerViewModel.Overrides.cs @@ -140,7 +140,7 @@ protected override async Task OnLoadPlayDataAsync() await LoadDashVideoSourceAsync(); } - _element.SetMediaPlayer(Player); + _element?.SetMediaPlayer(Player); } ///