compdfkit(win) - 右键菜单问题修复

Demo/Examples/Compdfkit_Tools/Annotation/AnnotationControl/AnnotationControl.xaml.cs

@@ -156,6 +156,8 @@ namespace Compdfkit_Tools.PDFControl
 
         private void UserControl_Loaded(object sender, RoutedEventArgs e)
         {
+            PDFViewControl.MouseRightButtonDownHandler -= PDFViewControl_MouseRightButtonDownHandler;
+            PDFViewControl.MouseRightButtonDownHandler += PDFViewControl_MouseRightButtonDownHandler;
             InitialPDFViewControl(PDFViewControl);
         }
 
@@ -163,6 +165,7 @@ namespace Compdfkit_Tools.PDFControl
         {
             //PDFViewControl.PDFView.AnnotCommandHandler -= PDFView_AnnotCommandHandler;
             //PDFViewControl.PDFView.WidgetClickHandler -= PDFView_WidgetClickHandler;
+            PDFViewControl.MouseRightButtonDownHandler -= PDFViewControl_MouseRightButtonDownHandler;
         }
 
 
@@ -201,8 +204,7 @@ namespace Compdfkit_Tools.PDFControl
             //PDFViewControl.PDFView.AnnotActiveHandler -= PDFView_AnnotActiveHandler;
             //PDFViewControl.PDFView.AnnotActiveHandler += PDFView_AnnotActiveHandler;
 
-            PDFViewControl.MouseRightButtonDownHandler -= PDFViewControl_MouseRightButtonDownHandler;
-            PDFViewControl.MouseRightButtonDownHandler += PDFViewControl_MouseRightButtonDownHandler;
+            
             //PDFViewControl.PDFView.AnnotCommandHandler += PDFView_AnnotCommandHandler;
             //PDFViewControl.PDFView.WidgetClickHandler += PDFView_WidgetClickHandler;
         }

Demo/Examples/Compdfkit_Tools/DigitalSignature/DigitalSignatureControl/DigitalSignatureControl.xaml.cs

@@ -146,8 +146,6 @@ namespace Compdfkit_Tools.PDFControl
             
             PDFViewControl.PDFViewTool.MouseLeftButtonDownHandler -= PDFViewControl_MouseLeftButtonDownHandler;
             PDFViewControl.PDFViewTool.MouseLeftButtonDownHandler += PDFViewControl_MouseLeftButtonDownHandler;
-            PDFViewControl.PDFViewTool.MouseRightButtonDownHandler -= PDFViewControl_MouseRightButtonDownHandler;
-            PDFViewControl.PDFViewTool.MouseRightButtonDownHandler += PDFViewControl_MouseRightButtonDownHandler;
             
             panelState.PropertyChanged -= PanelState_PropertyChanged;
             panelState.PropertyChanged += PanelState_PropertyChanged;
@@ -632,7 +630,8 @@ namespace Compdfkit_Tools.PDFControl
         /// <param name="e"></param>
         private void UserControl_Loaded(object sender, RoutedEventArgs e)
         {
-            
+            PDFViewControl.PDFViewTool.MouseRightButtonDownHandler -= PDFViewControl_MouseRightButtonDownHandler;
+            PDFViewControl.PDFViewTool.MouseRightButtonDownHandler += PDFViewControl_MouseRightButtonDownHandler;
         }
          
         /// <summary>
@@ -644,6 +643,7 @@ namespace Compdfkit_Tools.PDFControl
         {
             //PDFViewControl.PDFView.AnnotCommandHandler -= PDFView_AnnotCommandHandler;
             //PDFViewControl.PDFView.WidgetClickHandler -= PDFView_WidgetClickHandler;
+            PDFViewControl.PDFViewTool.MouseRightButtonDownHandler -= PDFViewControl_MouseRightButtonDownHandler;
         }
         
         #endregion

Demo/Examples/Compdfkit_Tools/Edit/ContentEditCOntrol/ContentEditControl.xaml.cs

@@ -345,12 +345,13 @@ namespace Compdfkit_Tools.PDFControl
 
         private void UserControl_Loaded(object sender, RoutedEventArgs e)
         {
-
+            PdfViewControl.MouseRightButtonDownHandler -= PdfViewControl_MouseRightButtonDownHandler;
+            PdfViewControl.MouseRightButtonDownHandler += PdfViewControl_MouseRightButtonDownHandler;
         }
 
         private void UserControl_UnLoaded(object sender, RoutedEventArgs e)
         {
-
+            PdfViewControl.MouseRightButtonDownHandler -= PdfViewControl_MouseRightButtonDownHandler;
         }
 
         public void ExpandRightPropertyPanel(UIElement propertytPanel, Visibility visible)
@@ -368,8 +369,7 @@ namespace Compdfkit_Tools.PDFControl
             PdfViewControl.MouseLeftButtonDownHandler += PDFToolManager_MouseLeftButtonDownHandler;
             PdfViewControl.MouseLeftButtonUpHandler -= PDFToolManager_MouseLeftButtonUpHandler;
             PdfViewControl.MouseLeftButtonUpHandler += PDFToolManager_MouseLeftButtonUpHandler;
-            PdfViewControl.MouseRightButtonDownHandler -= PdfViewControl_MouseRightButtonDownHandler;
-            PdfViewControl.MouseRightButtonDownHandler += PdfViewControl_MouseRightButtonDownHandler;
+            
             PdfViewControl = view;
             PDFGrid.Child = PdfViewControl;
             FloatPageTool.InitWithPDFViewer(view);

Demo/Examples/Compdfkit_Tools/Form/FormControl/FormControl.xaml.cs

@@ -83,11 +83,14 @@ namespace Compdfkit_Tools.PDFControl
         #region Load Unload custom control
         private void UserControl_Loaded(object sender, RoutedEventArgs e)
         {
+            PdfViewControl.MouseRightButtonDownHandler -= PdfViewControl_MouseRightButtonDownHandler;
+            PdfViewControl.MouseRightButtonDownHandler += PdfViewControl_MouseRightButtonDownHandler;
             InitialPDFViewControl(PdfViewControl);
         }
 
         private void UserControl_Unloaded(object sender, RoutedEventArgs e)
         {
+            PdfViewControl.MouseRightButtonDownHandler -= PdfViewControl_MouseRightButtonDownHandler;
         }
 
         #endregion
@@ -330,8 +333,6 @@ namespace Compdfkit_Tools.PDFControl
             PDFFormTool.ClearAllToolState();
             PdfViewControl.PDFViewTool.GetCPDFViewer().UndoManager.PropertyChanged -= UndoManager_PropertyChanged;
             PdfViewControl.PDFViewTool.GetCPDFViewer().UndoManager.PropertyChanged += UndoManager_PropertyChanged;
-            PdfViewControl.MouseRightButtonDownHandler -= PdfViewControl_MouseRightButtonDownHandler;
-            PdfViewControl.MouseRightButtonDownHandler += PdfViewControl_MouseRightButtonDownHandler;
 
             newPDFViewer.CustomSignHandle = true;
         }

Demo/Examples/Compdfkit_Tools/PDFView/RegularViewerControl.xaml

@@ -6,6 +6,7 @@
              xmlns:local="clr-namespace:Compdfkit_Tools.PDFView"
              xmlns:common="clr-namespace:Compdfkit_Tools.Common"
              mc:Ignorable="d"
+             Loaded="UserControl_Loaded"
              Unloaded="UserControl_Unloaded"
              d:DesignHeight="720" d:DesignWidth="1080">
     <Grid>

Demo/Examples/Compdfkit_Tools/PDFView/RegularViewerControl.xaml.cs

@@ -104,8 +104,6 @@ namespace Compdfkit_Tools.PDFView
             PDFGrid.Child = PdfViewControl;
             PdfViewControl.PDFViewTool.GetCPDFViewer().UndoManager.PropertyChanged -= UndoManager_PropertyChanged;
             PdfViewControl.PDFViewTool.GetCPDFViewer().UndoManager.PropertyChanged += UndoManager_PropertyChanged;
-            PdfViewControl.MouseRightButtonDownHandler -= PdfViewControl_MouseRightButtonDownHandler;
-            PdfViewControl.MouseRightButtonDownHandler += PdfViewControl_MouseRightButtonDownHandler;
             //PdfViewControl.PDFView.SetFormFieldHighlight(true);
         }
 
@@ -414,8 +412,15 @@ namespace Compdfkit_Tools.PDFView
 
         private void UserControl_Unloaded(object sender, RoutedEventArgs e)
         {
+            PdfViewControl.MouseRightButtonDownHandler -= PdfViewControl_MouseRightButtonDownHandler;
             //PdfViewControl.PDFView.AnnotCommandHandler -= PDFView_AnnotCommandHandler;
             //PdfViewControl.PDFView.WidgetClickHandler -= PDFView_WidgetClickHandler;
         }
+
+        private void UserControl_Loaded(object sender, RoutedEventArgs e)
+        {
+            PdfViewControl.MouseRightButtonDownHandler -= PdfViewControl_MouseRightButtonDownHandler;
+            PdfViewControl.MouseRightButtonDownHandler += PdfViewControl_MouseRightButtonDownHandler;
+        }
     }
 }

Demo/Examples/ContentEditor/MainWindow.xaml.cs

@@ -7,6 +7,8 @@ using Microsoft.Win32;
 using System;
 using System.Collections.Generic;
 using System.ComponentModel;
+using System.Linq;
+using System.Reflection;
 using System.Runtime.CompilerServices;
 using System.Windows;
 using System.Windows.Controls;

Demo/Examples/DigitalSignature/MainWindow.xaml.cs

@@ -8,6 +8,7 @@ using System;
 using System.Collections.Generic;
 using System.ComponentModel;
 using System.Linq;
+using System.Reflection;
 using System.Runtime.CompilerServices;
 using System.Text;
 using System.Threading.Tasks;

Demo/Examples/DocsEditor/MainWindow.xaml.cs

@@ -12,6 +12,8 @@ using System.IO;
 using System.Drawing;
 using System.ComponentModel;
 using System.Data;
+using System.Linq;
+using System.Reflection;
 using System.Runtime.CompilerServices;
 using ComPDFKit.PDFDocument;
 using Microsoft.Win32;

Demo/Examples/Forms/MainWindow.xaml.cs

@@ -4,6 +4,8 @@ using Microsoft.Win32;
 using System;
 using System.Collections.Generic;
 using System.ComponentModel;
+using System.Linq;
+using System.Reflection;
 using System.Runtime.CompilerServices;
 using System.Windows;
 using System.Windows.Controls;