Merge branch 'dev' of http://git.kdan.cc:8865/Windows/PDFOffice_Windows_exe into dev

PDF Office/ViewModels/FillAndSign/FillAndSignContentViewModel.cs

@@ -55,7 +55,8 @@ namespace PDF_Office.ViewModels.FillAndSign
         private PopMenu MultiAnnotPopMenu;
         private IRegionManager regions { get; set; }
         private Dictionary<string, AnnotArgsType> ToolExpandDict = new Dictionary<string, AnnotArgsType>();
-        public static bool IsEdit = false;
+        public static bool IsEdit = false;
+        public static bool IsSignPoint=false;
         public Brush SelectColor = new SolidColorBrush(Colors.GreenYellow);
         public double FillOpacity = 1;
         public double LineWidth = 1;
@@ -140,6 +141,7 @@ namespace PDF_Office.ViewModels.FillAndSign
         private void FindAnnotTypeKey(string tag, ref AnnotHandlerEventArgs annotArgs, bool isRightMenuAdd = false)
         {
             LineWidthMultiple = 1;
+            IsSignPoint=false;
             switch (tag)
             {
 
@@ -176,6 +178,7 @@ namespace PDF_Office.ViewModels.FillAndSign
                     annotArgs = GetStamp();
                     break;
                 case "RbtnPoint":
+                    IsSignPoint = true;
                     Shape = "DotShape";
                     ShapePoints = new List<List<Point>> { new List<Point> { new Point(3.19995, 3.19995), new Point(3.19995, 3.19995) } };
                     LineWidthMultiple = 5;
@@ -213,7 +216,7 @@ namespace PDF_Office.ViewModels.FillAndSign
             //stampAnnotArgs.Type = StampType.STANDARD_STAMP;
             // stampAnnotArgs.Type = StampType.STANDARD_STAMP;
             stampAnnotArgs.IsContinueMode = true;
-           
+            stampAnnotArgs.IsSignPoint = IsSignPoint;
             Dictionary<AnnotAttrib, object> annotAttribsList = new Dictionary<AnnotAttrib, object>();
             annotAttribsList[AnnotAttrib.Transparency] = stampAnnotArgs.Opacity;
             DefaultAnnotProperty annotProperty = SettingHelper.GetAnnotDefaultProperty(AnnotArgsType.AnnotStamp);
@@ -249,6 +252,7 @@ namespace PDF_Office.ViewModels.FillAndSign
             //stampAnnotArgs.StampText = "APPROVED";
             //stampAnnotArgs.Type = StampType.STANDARD_STAMP;
             stampAnnotArgs.IsContinueMode = true;
+            stampAnnotArgs.IsSignPoint = IsSignPoint;
             stampAnnotArgs.Opacity = FillOpacity;
             Dictionary<AnnotAttrib, object> annotAttribsList = new Dictionary<AnnotAttrib, object>();
             annotAttribsList[AnnotAttrib.Transparency] = stampAnnotArgs.Opacity;