Quellcode durchsuchen

阅读页-右键菜单-粘贴

OYXH\oyxh vor 2 Jahren
Ursprung
Commit
359645ab93

+ 3 - 2
PDF Office/ViewModels/Tools/AnnotToolContentViewModel.Command.cs

@@ -397,6 +397,7 @@ namespace PDF_Office.ViewModels.Tools
                                         ShapeAnnotPopMenu.SetVisual("ShapeDirect", false);
                                         e.PopupMenu = ShapeAnnotPopMenu.OpenMenu(selectedAnnot, sender);
                                         break;
+
                                     case AnnotArgsType.AnnotLine:
                                         ShapeAnnotPopMenu.SetVisual("ShapeDirect", true);
                                         e.PopupMenu = ShapeAnnotPopMenu.OpenMenu(selectedAnnot, sender);
@@ -425,7 +426,7 @@ namespace PDF_Office.ViewModels.Tools
 
                                 MultiAnnotPopMenu.SetVisual("MultiCopy", !isHigh);
                                 MultiAnnotPopMenu.SetVisual("MultiCut", !isHigh);
-                                e.PopupMenu = MultiAnnotPopMenu.OpenMenu(e.AnnotEventArgsList,sender);//SelectMultiAnnotMenu(e.AnnotEventArgsList, isHigh);
+                                e.PopupMenu = MultiAnnotPopMenu.OpenMenu(e.AnnotEventArgsList, sender);//SelectMultiAnnotMenu(e.AnnotEventArgsList, isHigh);
                             }
                         }
                         if (e.PopupMenu != null)
@@ -445,7 +446,7 @@ namespace PDF_Office.ViewModels.Tools
                         }
                         else
                         {
-                            e.PopupMenu = ViewerContextMenu();
+                            e.PopupMenu = ViewerContextMenu(sender);
                             if (e.PopupMenu != null)
                             {
                                 e.Handle = true;

+ 15 - 15
PDF Office/ViewModels/Tools/AnnotToolContentViewModel.Layout.cs

@@ -83,15 +83,15 @@ namespace PDF_Office.ViewModels.Tools
 
         #region 阅读页 - 右键菜单
 
-        private ContextMenu ViewerContextMenu()
+        private ContextMenu ViewerContextMenu(object sender)
         {
             ContextMenu contextMenu = App.Current.FindResource("ViewerContextMenu") as ContextMenu;
             //contextMenu.Loaded += ContextMenu_Loaded;
-            ViewerContextMenu_Loaded(contextMenu, null);
+            ViewerContextMenu_Loaded(contextMenu, sender);
             return contextMenu;
         }
 
-        private void ViewerContextMenu_Loaded(object sender, RoutedEventArgs e)
+        private void ViewerContextMenu_Loaded(object sender, object e)
         {
             ContextMenu contextMenu = sender as ContextMenu;
             if (contextMenu.Items.Count > 0)
@@ -121,18 +121,18 @@ namespace PDF_Office.ViewModels.Tools
                         {
                             case "Paste":
                                 //粘贴
-                                if (!ApplicationCommands.Paste.CanExecute(null, (UIElement)sender))
-                                {
-                                    menuItem1.IsEnabled = false;
-                                    menuItem1.Opacity = 0.5;
-                                }
-                                else
-                                {
-                                    menuItem1.IsEnabled = true;
-                                    menuItem1.Opacity = 1;
-                                }
-                                menuItem1.CommandTarget = (UIElement)sender;
-                                menuItem1.Command = ApplicationCommands.Copy;
+                                //if (!ApplicationCommands.Paste.CanExecute(null, (UIElement)sender))
+                                //{
+                                //    menuItem1.IsEnabled = false;
+                                //    menuItem1.Opacity = 0.5;
+                                //}
+                                //else
+                                //{
+                                //    menuItem1.IsEnabled = true;
+                                //    menuItem1.Opacity = 1;
+                                //}
+                                menuItem1.CommandTarget = (UIElement)e;
+                                menuItem1.Command = ApplicationCommands.Paste;
                                 break;
 
                             case "AddAnnotation":