支持鼠标中键及侧键返回 (#888)

Richasy · Mar 25, 2022 · 965b288 · 965b288
1 parent ef53831
commit 965b288
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 22 deletions.
diff --git a/src/App/Pages/Overlay/PlayerPage.xaml b/src/App/Pages/Overlay/PlayerPage.xaml
@@ -6,7 +6,6 @@
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:loc="using:Richasy.Bili.Locator.Uwp"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-    xmlns:muxc="using:Microsoft.UI.Xaml.Controls"
     xmlns:pages="using:Richasy.Bili.App.Pages"
     mc:Ignorable="d">
 

diff --git a/src/App/Pages/Overlay/PlayerPage.xaml.cs b/src/App/Pages/Overlay/PlayerPage.xaml.cs
@@ -80,25 +80,6 @@ protected override void OnNavigatedFrom(NavigationEventArgs e)
             CoreViewModel.IsOverLayerExtendToTitleBar = false;
         }
 
-        /// <inheritdoc/>
-        protected override void OnPointerReleased(PointerRoutedEventArgs e)
-        {
-            if (e.GetCurrentPoint(this).Properties.PointerUpdateKind == Windows.UI.Input.PointerUpdateKind.XButton1Released)
-            {
-                e.Handled = true;
-                if (ViewModel.PlayerDisplayMode != PlayerDisplayMode.Default)
-                {
-                    ViewModel.PlayerDisplayMode = PlayerDisplayMode.Default;
-                }
-                else
-                {
-                    CoreViewModel.Back();
-                }
-            }
-
-            base.OnPointerReleased(e);
-        }
-
         private async void OnLoadedAsync(object sender, RoutedEventArgs e)
         {
             ViewModel.PropertyChanged += OnViewModelPropertyChanged;

diff --git a/src/App/Pages/RootPage.xaml b/src/App/Pages/RootPage.xaml
@@ -10,7 +10,7 @@
     muxc:BackdropMaterial.ApplyToRootOrPageBackground="True"
     mc:Ignorable="d">
 
-    <Grid>
+    <Grid Background="{ThemeResource SystemControlTransparentBrush}">
         <Grid.RowDefinitions>
             <RowDefinition Height="Auto" />
             <RowDefinition Height="*" />

diff --git a/src/App/Pages/RootPage.xaml.cs b/src/App/Pages/RootPage.xaml.cs
@@ -94,7 +94,9 @@ protected override void OnNavigatedTo(NavigationEventArgs e)
         /// <inheritdoc/>
         protected override void OnPointerReleased(PointerRoutedEventArgs e)
         {
-            if (e.GetCurrentPoint(this).Properties.PointerUpdateKind == Windows.UI.Input.PointerUpdateKind.XButton1Released)
+            var kind = e.GetCurrentPoint(this).Properties.PointerUpdateKind;
+            if (kind == Windows.UI.Input.PointerUpdateKind.XButton1Released
+                || kind == Windows.UI.Input.PointerUpdateKind.MiddleButtonReleased)
             {
                 e.Handled = true;
                 CoreViewModel.Back();