注释-交互优化

PDF Office/Model/AnnotPanel/FontBoard.cs

@@ -507,12 +507,12 @@ namespace PDF_Master.Model.AnnotPanel
                 if (fontWeights == FontWeights.Normal)
                 {
                     strValue = "Regular";
-                    strContent = "常规";
+                    strContent = "Regular";
                 }
                 else
                 {
                     strValue = "Bold";
-                    strContent = "粗体";
+                    strContent = "Bold";
                 }
             }
             else
@@ -520,12 +520,12 @@ namespace PDF_Master.Model.AnnotPanel
                 if (fontWeights == FontWeights.Normal)
                 {
                     strValue = "Italic";
-                    strContent = "斜体";
+                    strContent = "Italic";
                 }
                 else
                 {
                     strValue = "Bold Italic";
-                    strContent = "粗斜体";
+                    strContent = "Bold Italic";
                 }
             }
 

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

@@ -1648,7 +1648,7 @@ namespace PDF_Master.ViewModels.Tools
                             //创建注释后，修改注释属性，可用于下次创建的注释
                             if (PropertyPanel != null && PropertyPanel.annot != null && PDFViewer.MouseMode == MouseModes.AnnotCreate)
                             {
-                                if (StrAnnotToolChecked == key.Key && PropertyPanel.SharpsAnnot == key.Key)
+                                if (StrAnnotToolChecked == "Rect" && PropertyPanel.SharpsAnnot == key.Key)
                                 {
                                     PDFViewer.SetToolParam(PropertyPanel.annot);
                                     PropertyPanel.SaveLastAnnot();

PDF Office/ViewModels/Tools/AnnotToolContentViewModel.cs

@@ -249,6 +249,8 @@ namespace PDF_Master.ViewModels.Tools
                 //取消选中注释工具按钮后，恢复到未编辑注释的状态
                 PropertyPanel.IsAddLink = false;
                 //PropertyPanel.IsLocationLink = false;
+                PDFViewer.DisableClearSelectAnnot(false);
+                PDFViewer.ClearSelectAnnots();
                 PDFViewer.ToolManager.EnableClickCreate = false;
                 PDFViewer.SetMouseMode(MouseModes.PanTool);
                 ShowPropertyPanel(false);