注释-15790

PDF Office/ViewModels/Tools/AnnotToolContentViewModel.Command.cs

@@ -466,6 +466,10 @@ namespace PDF_Master.ViewModels.Tools
                         }
                         return;
                     }
+                    if(StrAnnotToolChecked == "Freehand")
+                    {
+                        GetFreehand();
+                    }
                 }
             }
 

PDF Office/ViewModels/Tools/AnnotToolContentViewModel.Function.cs

@@ -617,10 +617,12 @@ namespace PDF_Master.ViewModels.Tools
                 }
                 else
                 {
-                    freehandArgs = PropertyPanel.LastAnnotDict[AnnotArgsType.AnnotFreehand] as FreehandAnnotArgs;
-                    freehandArgs.AnnotIndex = -1;
-                    freehandArgs.PageIndex = -1;
-                    freehandArgs.ClientRect = Rect.Empty;
+                    FreehandAnnotArgs freehandAnnotArgs = PropertyPanel.LastAnnotDict[AnnotArgsType.AnnotFreehand] as FreehandAnnotArgs;
+                    freehandArgs = new FreehandAnnotArgs();
+                    freehandArgs.InkColor = freehandAnnotArgs.InkColor;
+                    freehandArgs.Transparency = freehandAnnotArgs.Transparency;
+                    freehandArgs.LineWidth = freehandAnnotArgs.LineWidth;
+                    freehandArgs.LineDash = freehandAnnotArgs.LineDash;
                 }
 
                 selectedArgs = new List<AnnotHandlerEventArgs>();

PDF Office/ViewModels/Tools/AnnotToolContentViewModel.cs

@@ -205,7 +205,9 @@ namespace PDF_Master.ViewModels.Tools
         //点击注释工具
         private void BtnMyTools_Click(CustomIconToggleBtn annotBtn)
         {
-            if (PDFViewer == null || annotBtn == null || annotBtn.Tag == null) return;
+            if (PDFViewer == null || annotBtn == null || annotBtn.Tag == null) return;
+            //if(viewContentViewModel.OpenBOTA==false)
+            this.events.GetEvent<CleanSelectAllEvent>().Publish(new CleanSelectAllArgs() { Unicode = App.mainWindowViewModel.SelectedItem.Unicode, IsCleanSelectAll = true });
 
             //不创建注释，属于注释模板
             Dictionary<string, bool> dictVar = new Dictionary<string, bool>();