修复侧键返回逻辑 (#696)

Richasy · Sep 28, 2024 · c6b8552 · c6b8552
1 parent 24bd493
commit c6b8552
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/src/Desktop/BiliCopilot.UI/Controls/Core/Player/BiliPlayer.Methods.cs b/src/Desktop/BiliCopilot.UI/Controls/Core/Player/BiliPlayer.Methods.cs
@@ -1,5 +1,6 @@
 // Copyright (c) Bili Copilot. All rights reserved.
 
+using BiliCopilot.UI.Forms;
 using BiliCopilot.UI.Models.Constants;
 using BiliCopilot.UI.Toolkits;
 using BiliCopilot.UI.ViewModels.Core;
@@ -248,6 +249,10 @@ private void OnRootPointerPressed(object sender, PointerRoutedEventArgs e)
  ViewModel.ToggleFullScreenCommand.Execute(default);
  }
  }
+ else if (this.Get<AppViewModel>().ActivatedWindow is MainWindow)
+ {
+ this.Get<NavigationViewModel>().Back();
+ }
  }
  }
  }

diff --git a/src/Desktop/BiliCopilot.UI/Controls/Core/Player/IslandPlayer.Win32.cs b/src/Desktop/BiliCopilot.UI/Controls/Core/Player/IslandPlayer.Win32.cs
@@ -171,11 +171,6 @@ public void SetContent(UIElement element)
  /// <inheritdoc/>
  public void Dispose()
  {
- if (_desktopWindowXamlSource != null)
- {
- _desktopWindowXamlSource.Content = default;
- _desktopWindowXamlSource?.SiteBridge?.Dispose();
- _desktopWindowXamlSource?.Dispose();
- }
+ _desktopWindowXamlSource?.Dispose();
  }
 }