进入新窗口播放时遵循默认播放模式 (#593)

Richasy · Sep 18, 2024 · 0884c56 · 0884c56
1 parent b3850c8
commit 0884c56
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 7 deletions.
diff --git a/src/Desktop/BiliCopilot.UI/Forms/MainWindow.xaml.cs b/src/Desktop/BiliCopilot.UI/Forms/MainWindow.xaml.cs
@@ -284,8 +284,6 @@ private static LRESULT HookKeyboardCallback(int nCode, WPARAM wParam, LPARAM lPa
  }
  }
 
- Debug.WriteLine("Keyboard Hook: " + nCode);
-
  return PInvoke.CallNextHookEx(HHOOK.Null, nCode, wParam, lParam);
  }
 }

diff --git a/src/Desktop/BiliCopilot.UI/ViewModels/Core/PlayerViewModelBase/PlayerViewModelBase.cs b/src/Desktop/BiliCopilot.UI/ViewModels/Core/PlayerViewModelBase/PlayerViewModelBase.cs
@@ -77,11 +77,7 @@ public virtual async Task SetPlayDataAsync(string? videoUrl, string? audioUrl, b
  _smtc.ButtonPressed += OnSystemControlsButtonPressedAsync;
 
  // 独立窗口播放时默认全窗口播放. 外置播放器播放时除外.
- if (IsSeparatorWindowPlayer && !IsFullWindow && !IsExternalPlayer)
- {
- ToggleFullWindowCommand.Execute(default);
- }
- else if (!IsExternalPlayer)
+ if (!IsExternalPlayer)
  {
  var defaultDisplay = SettingsToolkit.ReadLocalSetting(SettingNames.DefaultPlayerDisplayMode, PlayerDisplayMode.Default);
  if (!IsFullScreen && defaultDisplay == PlayerDisplayMode.FullScreen)

diff --git a/src/Libs/Danmaku.Core/DanmakuFrostMaster.cs b/src/Libs/Danmaku.Core/DanmakuFrostMaster.cs
@@ -1,7 +1,9 @@
 //<auto-generated/>
 using Microsoft.Graphics.Canvas.Text;
 using Microsoft.Graphics.Canvas.UI.Xaml;
+using Microsoft.UI;
 using Microsoft.UI.Xaml.Controls;
+using Microsoft.UI.Xaml.Media;
 using System;
 using System.Collections.Generic;
 using System.Linq;
@@ -43,6 +45,8 @@ public DanmakuFrostMaster(Grid rootGrid, LoggingChannel loggingChannel = null, A
  {
  rootGrid.Children.Clear();
  var canvas = new CanvasAnimatedControl();
+ canvas.ClearColor = Colors.Transparent;
+ canvas.Background = new SolidColorBrush(Colors.Transparent);
  rootGrid.Children.Add(canvas);
  Logger.SetLogger(loggingChannel);