Feat | 完善右键菜单逻辑

Author: kitUIN

ShadowViewer/Pages/NavigationPage.xaml

@@ -1,4 +1,4 @@
-<Page
+<controls1:ShadowPage
     x:Class="ShadowViewer.Pages.NavigationPage"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
@@ -11,6 +11,7 @@
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     xmlns:models="using:ShadowViewer.Core.Models"
     xmlns:shadow="using:ShadowViewer.Controls"
+    xmlns:controls1="using:ShadowViewer.Core.Controls"
     NavigationCacheMode="Required"
     mc:Ignorable="d">
     <Grid>
@@ -151,4 +152,4 @@
             ShowDirection="RightToLeft"
             Visibility="Collapsed" />
     </Grid>
-</Page>
+</controls1:ShadowPage>

ShadowViewer/Pages/NavigationPage.xaml.cs

@@ -14,10 +14,11 @@
 using ShadowViewer.Core.Services;
 using ShadowViewer.ViewModels;
 using ShadowViewer.Services;
+using ShadowViewer.Core.Controls;
 
 namespace ShadowViewer.Pages
 {
-    public sealed partial class NavigationPage : Page
+    public sealed partial class NavigationPage : ShadowPage
     {
         public static ILogger Logger { get; } = Log.ForContext<NavigationPage>();
         private static CancellationTokenSource _cancelTokenSource = new();
@@ -73,9 +74,7 @@ private async void Caller_TopGridEvent(object sender, TopGridEventArg e)
                 {
                     case TopGridMode.ContentDialog:
                         if (e.Element is ContentDialog dialog)
-                        {
-                            dialog.XamlRoot = XamlRoot;
-
+                        { 
                             await dialog.ShowAsync();
                         }
 

ShadowViewer/Pages/SettingsPage.xaml

@@ -31,7 +31,7 @@
             NotEmptyValue="True" />
         <shadowConverters:ThemeComboConverter x:Key="ThemeComboConverter" />
     </Page.Resources>
-    <Grid Loaded="FrameworkElement_OnLoaded"
+    <Grid
         Background="{ThemeResource LayerFillColorDefaultBrush}"
         BorderBrush="{ThemeResource CardStrokeColorDefaultBrush}"
         BorderThickness="1"

ShadowViewer/ViewModels/TitleBarViewModel.cs

@@ -13,6 +13,7 @@
 using ShadowViewer.Core.Models.Interfaces;
 using ShadowViewer.Core.Responders;
 using ShadowViewer.Core.Services;
+using ShadowViewer.Core.Utils;
 using ShadowViewer.I18n;
 using ShadowViewer.Models;