|
@@ -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
|
|
|
{
|