Browse Source

compdfkit(win) - 解决注释选中无法调整问题

liuaoran 11 months ago
parent
commit
dd80583ad1

+ 9 - 14
Demo/Examples/Compdfkit_Tools/Annotation/PDFAnnotationPanel/PDFAnnotationControl/CPDFAnnotationControl.xaml.cs

@@ -18,9 +18,9 @@ using ComPDFKit.Tool;
 using ComPDFKit.Tool.Help;
 using ComPDFKit.Tool.SettingParam;
 using ComPDFKit.Import;
-using ComPDFKitViewer.BaseObject; 
+using ComPDFKitViewer.BaseObject;
 using ComPDFKitViewer.Helper;
-using ComPDFKit.Viewer.Helper; 
+using ComPDFKit.Viewer.Helper;
 
 namespace Compdfkit_Tools.PDFControl
 {
@@ -145,7 +145,7 @@ namespace Compdfkit_Tools.PDFControl
         public void UnLoadPDFViewHandler()
         {
             if (this.pdfViewerControl != null)
-            { 
+            {
                 pdfViewerControl.MouseLeftButtonDownHandler -= PDFToolManager_MouseLeftButtonDownHandler;
             }
         }
@@ -1091,6 +1091,9 @@ namespace Compdfkit_Tools.PDFControl
                     {
                         tempAnnotationPanel = new CPDFShapeUI();
                         (tempAnnotationPanel as CPDFShapeUI).InitWithAnnotationType(CPDFAnnotationType.Square);
+
+                        int page = baseAnnot.GetAnnotData().PageIndex;
+                        var annot = baseAnnot.GetAnnotData().Annot;
                         AnnotParam annotParam = ParamConverter.CPDFDataConverterToAnnotParam(
                                                                pdfViewerControl.PDFViewTool.GetCPDFViewer().GetDocument(),
                                                                baseAnnot.GetAnnotData().PageIndex,
@@ -1254,18 +1257,10 @@ namespace Compdfkit_Tools.PDFControl
 
         public void SetAnnotEventData()
         {
-            if (pdfViewerControl.GetCacheHitTestAnnot()!= null)
+            if (pdfViewerControl.GetCacheHitTestAnnot() != null)
             {
-                if (pdfViewerControl.PDFToolManager.GetToolType() == ToolType.CreateAnnot && isTempPanel)
-                {
-                    ShowCurrentAnnotPanel();
-                    isTempPanel = false;
-                }
-                else
-                {
-                    ShowTempAnnotPanel();
-                    isTempPanel = true;
-                }
+                ShowTempAnnotPanel();
+                isTempPanel = true;
             }
             else
             {

+ 3 - 14
Demo/Examples/Compdfkit_Tools/Form/FormControl/FormControl.xaml.cs

@@ -122,14 +122,7 @@ namespace Compdfkit_Tools.PDFControl
 
         #endregion
 
-        #region Private Command Method
-
-
-
-        private void PDFToolManager_MouseMoveHandler(object sender, MouseEventObject e)
-        {
-
-        }
+        #region Private Command Method 
 
         private void PDFToolManager_MouseLeftButtonUpHandler(object sender, MouseEventObject e)
         {
@@ -209,8 +202,7 @@ namespace Compdfkit_Tools.PDFControl
             DateTime dateTime = DateTime.Now;
             return " " + dateTime.ToString("yyyy-MM-dd HH:mm:ss.fff");
         }
-
-
+         
         private void UndoButton_Click(object sender, RoutedEventArgs e)
         {
             if (PdfViewControl != null && PdfViewControl.PDFViewTool != null)
@@ -293,11 +285,9 @@ namespace Compdfkit_Tools.PDFControl
 
             PdfViewControl.MouseLeftButtonDownHandler -= PDFToolManager_MouseLeftButtonDownHandler;
             PdfViewControl.MouseLeftButtonUpHandler -= PDFToolManager_MouseLeftButtonUpHandler;
-            PdfViewControl.MouseMoveHandler -= PDFToolManager_MouseMoveHandler;
 
             PdfViewControl.MouseLeftButtonDownHandler += PDFToolManager_MouseLeftButtonDownHandler;
             PdfViewControl.MouseLeftButtonUpHandler += PDFToolManager_MouseLeftButtonUpHandler;
-            PdfViewControl.MouseMoveHandler += PDFToolManager_MouseMoveHandler;
             PDFFormTool.InitWithPDFViewer(pDFViewControl, FromPropertyControl);
             FloatPageTool.InitWithPDFViewer(pDFViewControl);
             PDFGrid.Child = PdfViewControl;
@@ -387,7 +377,6 @@ namespace Compdfkit_Tools.PDFControl
         }
 
         #endregion
-
-
+         
     }
 }