|
@@ -91,6 +91,12 @@ namespace Compdfkit_Tools.PDFControl
|
|
if (e.IsCreate)
|
|
if (e.IsCreate)
|
|
{
|
|
{
|
|
pdfViewerControl.UpdateAnnotFrame();
|
|
pdfViewerControl.UpdateAnnotFrame();
|
|
|
|
+
|
|
|
|
+ }
|
|
|
|
+ if (currentAnnotationType == CPDFAnnotationType.Image || currentAnnotationType == CPDFAnnotationType.Stamp || currentAnnotationType == CPDFAnnotationType.Signature)
|
|
|
|
+ {
|
|
|
|
+ pdfViewerControl.SetToolType(ToolType.Pan);
|
|
|
|
+ pdfViewerControl.SetIsVisibleCustomMouse(false);
|
|
pdfViewerControl.SetIsShowStampMouse(false);
|
|
pdfViewerControl.SetIsShowStampMouse(false);
|
|
}
|
|
}
|
|
}
|
|
}
|
|
@@ -221,6 +227,8 @@ namespace Compdfkit_Tools.PDFControl
|
|
if (pdfAnnotationData == null)
|
|
if (pdfAnnotationData == null)
|
|
{
|
|
{
|
|
pdfViewerControl.SetToolType(ToolType.Pan);
|
|
pdfViewerControl.SetToolType(ToolType.Pan);
|
|
|
|
+ pdfViewerControl.SetIsShowStampMouse(false);
|
|
|
|
+ pdfViewerControl.SetIsVisibleCustomMouse(false);
|
|
return;
|
|
return;
|
|
}
|
|
}
|
|
|
|
|
|
@@ -764,7 +772,7 @@ namespace Compdfkit_Tools.PDFControl
|
|
{
|
|
{
|
|
this.pdfViewerControl.SetToolType(ToolType.Pan);
|
|
this.pdfViewerControl.SetToolType(ToolType.Pan);
|
|
pdfViewerControl.SetIsShowStampMouse(false);
|
|
pdfViewerControl.SetIsShowStampMouse(false);
|
|
- //ClearPanel();
|
|
|
|
|
|
+ ClearPanel();
|
|
}
|
|
}
|
|
|
|
|
|
private void CPDFAnnotationControl_PropertyChanged(object sender, CPDFAnnotationData e)
|
|
private void CPDFAnnotationControl_PropertyChanged(object sender, CPDFAnnotationData e)
|
|
@@ -844,6 +852,8 @@ namespace Compdfkit_Tools.PDFControl
|
|
if (pdfFreehandUI == null)
|
|
if (pdfFreehandUI == null)
|
|
{
|
|
{
|
|
pdfFreehandUI = new CPDFFreehandUI();
|
|
pdfFreehandUI = new CPDFFreehandUI();
|
|
|
|
+ pdfFreehandUI.EraseClickHandler -= PdfFreehandUI_EraseClickHandler;
|
|
|
|
+ pdfFreehandUI.EraseChangeHandler -= PdfFreehandUI_EraseChangeHandler;
|
|
pdfFreehandUI.EraseClickHandler += PdfFreehandUI_EraseClickHandler;
|
|
pdfFreehandUI.EraseClickHandler += PdfFreehandUI_EraseClickHandler;
|
|
pdfFreehandUI.EraseChangeHandler += PdfFreehandUI_EraseChangeHandler;
|
|
pdfFreehandUI.EraseChangeHandler += PdfFreehandUI_EraseChangeHandler;
|
|
}
|
|
}
|
|
@@ -1144,6 +1154,8 @@ namespace Compdfkit_Tools.PDFControl
|
|
baseAnnot.GetAnnotData().PageIndex,
|
|
baseAnnot.GetAnnotData().PageIndex,
|
|
baseAnnot.GetAnnotData().Annot);
|
|
baseAnnot.GetAnnotData().Annot);
|
|
tempFreehandPanel.SetPresentAnnotAttrib(annotParam, baseAnnot.GetAnnotData().Annot, pdfViewerControl.PDFToolManager.GetDocument(), pdfViewerControl);
|
|
tempFreehandPanel.SetPresentAnnotAttrib(annotParam, baseAnnot.GetAnnotData().Annot, pdfViewerControl.PDFToolManager.GetDocument(), pdfViewerControl);
|
|
|
|
+ tempFreehandPanel.EraseClickHandler -= PdfFreehandUI_EraseClickHandler;
|
|
|
|
+ tempFreehandPanel.EraseChangeHandler -= PdfFreehandUI_EraseChangeHandler;
|
|
tempFreehandPanel.EraseClickHandler += PdfFreehandUI_EraseClickHandler;
|
|
tempFreehandPanel.EraseClickHandler += PdfFreehandUI_EraseClickHandler;
|
|
tempFreehandPanel.EraseChangeHandler += PdfFreehandUI_EraseChangeHandler;
|
|
tempFreehandPanel.EraseChangeHandler += PdfFreehandUI_EraseChangeHandler;
|
|
tempAnnotationPanel = tempFreehandPanel;
|
|
tempAnnotationPanel = tempFreehandPanel;
|