Browse Source

ComPDFKit.Tool(win) - 修复在刷新注释时会重现渲染页面的问题

TangJinZhou 8 months ago
parent
commit
b63246844f
1 changed files with 8 additions and 13 deletions
  1. 8 13
      Demo/Examples/ComPDFKit.Tool/CPDFToolManager.cs

+ 8 - 13
Demo/Examples/ComPDFKit.Tool/CPDFToolManager.cs

@@ -20,8 +20,6 @@ using ComPDFKit.Tool.Help;
 using ComPDFKit.Measure;
 using System.Dynamic;
 using System.Globalization;
-using System.Reflection;
-using static ComPDFKit.Tool.Help.ImportWin32;
 
 namespace ComPDFKit.Tool
 {
@@ -324,6 +322,7 @@ namespace ComPDFKit.Tool
                 default:
                     break;
             }
+
             if (oldToolType == ToolType.ContentEdit)
             {
                 viewerTool.GetCPDFViewer().GetDocument().ReleasePages();
@@ -333,10 +332,6 @@ namespace ComPDFKit.Tool
                 viewerTool.GetCPDFViewer().UpdateVirtualNodes();
                 viewerTool.GetCPDFViewer().UpdateRenderFrame();
             }
-            else
-            {
-                viewerTool.GetCPDFViewer().UpdateRenderFrame();
-            }
         }
 
         public CPDFEditArea GetSelectedEditAreaObject(ref int pageIndex)
@@ -485,7 +480,7 @@ namespace ComPDFKit.Tool
             annotHistory.CurrentParam = currentParam;
             annotHistory.Action = HistoryAction.Update;
             viewerTool.GetCPDFViewer().UndoManager.AddHistory(annotHistory);
-            viewerTool.GetCPDFViewer().UpdateRenderFrame();
+            viewerTool.GetCPDFViewer().UpdateAnnotFrame();
             AnnotDefaultEditedHandler?.Invoke(this, e);
         }
 
@@ -542,7 +537,6 @@ namespace ComPDFKit.Tool
             //Add end edit
             cPDFEditPage.EndEdit();
             viewerTool.GetCPDFViewer().UndoManager.AddHistory(groupHistory);
-
             viewerTool.GetCPDFViewer().UpdateRenderFrame();
         }
 
@@ -759,7 +753,7 @@ namespace ComPDFKit.Tool
             annotHistory.CurrentParam = currentParam;
             annotHistory.Action = HistoryAction.Update;
             viewerTool.GetCPDFViewer().UndoManager.AddHistory(annotHistory);
-            viewerTool.GetCPDFViewer().UpdateRenderFrame();
+            viewerTool.GetCPDFViewer().UpdateAnnotFrame();
         }
 
         private void ViewerTool_MouseLeftButtonUpHandler(object sender, MouseEventObject e)
@@ -842,7 +836,7 @@ namespace ComPDFKit.Tool
                             annotHistory.CurrentParam = annotParam;
                             annotHistory.PDFDoc = cPDFDocument;
                             viewerTool.GetCPDFViewer().UndoManager.AddHistory(annotHistory);
-                            viewerTool.GetCPDFViewer().UpdateRenderFrame();
+                            viewerTool.GetCPDFViewer().UpdateAnnotFrame();
                             e.annotType = cPDFAnnotation.Type;
                             e.IsCreate = true;
                             dynamic expandData = new ExpandoObject();
@@ -995,7 +989,7 @@ namespace ComPDFKit.Tool
                             annotHistory.CurrentParam = annotParam;
                             annotHistory.PDFDoc = cPDFDocument;
                             viewerTool.GetCPDFViewer().UndoManager.AddHistory(annotHistory);
-                            viewerTool.GetCPDFViewer().UpdateRenderFrame();
+                            viewerTool.GetCPDFViewer().UpdateAnnotFrame();
                             e.annotType = cPDFAnnotation.Type;
                             e.IsCreate = true;
                             dynamic expandData = new ExpandoObject();
@@ -1377,7 +1371,8 @@ namespace ComPDFKit.Tool
                 viewerTool.GetCPDFViewer().UndoManager.AddHistory(annotHistory);
 
                 viewerTool.ClearDrawAnnot();
-                viewerTool.GetCPDFViewer().UpdateRenderFrame();
+                viewerTool.GetCPDFViewer().UpdateAnnotFrame();
+
                 {
                     e.annotType = annotation.Type;
                     e.IsCreate = true;
@@ -1685,7 +1680,7 @@ namespace ComPDFKit.Tool
                 }
             }
             viewerTool.ClearDrawAnnot();
-            viewerTool.GetCPDFViewer().UpdateRenderFrame();
+            viewerTool.GetCPDFViewer().UpdateAnnotFrame();
             InkAnnotHistory inkAnnotHistory = new InkAnnotHistory();
             AnnotParam annotParam = ParamConverter.AnnotConverter(viewerTool.PDFViewer.GetDocument(), cPDFAnnotation);
             annotParam.AnnotIndex = cPDFAnnotation.Page.GetAnnotCount() - 1;