|
@@ -1525,6 +1525,7 @@ namespace PDF_Master.ViewModels.FillAndSign
|
|
|
|
|
|
private void PDFViewer_AnnotEditHandler(object sender, List<AnnotEditEvent> e)
|
|
|
{
|
|
|
+ bool isDifferen = false;
|
|
|
if (e != null && e.Count > 0)
|
|
|
{
|
|
|
Dictionary<int, List<int>> selectAnnotDicts = new Dictionary<int, List<int>>();
|
|
@@ -1537,15 +1538,18 @@ namespace PDF_Master.ViewModels.FillAndSign
|
|
|
switch (editEvent.EditAction)
|
|
|
{
|
|
|
case ActionType.Add:
|
|
|
- if (selectAnnotDicts.ContainsKey(editEvent.PageIndex) == false)
|
|
|
- {
|
|
|
- selectAnnotDicts.Add(editEvent.PageIndex, new List<int>());
|
|
|
- selectAnnotDicts[editEvent.PageIndex].Add(editEvent.AnnotIndex);
|
|
|
- }
|
|
|
- else
|
|
|
- {
|
|
|
- selectAnnotDicts[editEvent.PageIndex].Add(editEvent.AnnotIndex);
|
|
|
- }
|
|
|
+
|
|
|
+
|
|
|
+ if (selectAnnotDicts.ContainsKey(editEvent.PageIndex) == false)
|
|
|
+ {
|
|
|
+ selectAnnotDicts.Add(editEvent.PageIndex, new List<int>());
|
|
|
+ selectAnnotDicts[editEvent.PageIndex].Add(editEvent.AnnotIndex);
|
|
|
+ }
|
|
|
+ else
|
|
|
+ {
|
|
|
+ selectAnnotDicts[editEvent.PageIndex].Add(editEvent.AnnotIndex);
|
|
|
+ }
|
|
|
+
|
|
|
//if (editEvent.EditAnnotArgs.EventType == AnnotArgsType.AnnotFreehand)
|
|
|
//{
|
|
|
// //if (IsSelectShape)
|
|
@@ -1576,9 +1580,10 @@ namespace PDF_Master.ViewModels.FillAndSign
|
|
|
else
|
|
|
{
|
|
|
viewContentViewModel.FillAndSign.Add(new FillAndSignIsShape(pageindex, annotindex, Shape));
|
|
|
+ PDFViewer.SelectAnnotation(pageindex, annotindex);
|
|
|
}
|
|
|
}
|
|
|
- PDFViewer.SelectAnnotation(pageindex, annotindex);
|
|
|
+
|
|
|
}
|
|
|
//else
|
|
|
//{
|
|
@@ -1612,12 +1617,12 @@ namespace PDF_Master.ViewModels.FillAndSign
|
|
|
{
|
|
|
if (e != null)
|
|
|
{
|
|
|
-
|
|
|
+
|
|
|
IsClickNull = false;
|
|
|
var annot = e.AnnotItemsList[0];
|
|
|
if (annot != null)
|
|
|
{
|
|
|
-
|
|
|
+
|
|
|
if (e.AnnotItemsList.Count == 1)
|
|
|
{
|
|
|
//IsEdit = false;
|
|
@@ -1704,9 +1709,9 @@ namespace PDF_Master.ViewModels.FillAndSign
|
|
|
{
|
|
|
viewContentViewModel.SelectedPrpoertyPanel("PropertyPanelContent", null);
|
|
|
}
|
|
|
-
|
|
|
+
|
|
|
else { IsClickNull = true; }
|
|
|
-
|
|
|
+
|
|
|
}
|
|
|
}
|
|
|
|