注释 快捷键

PDF Office/ViewModels/Tools/AnnotToolContentViewModel.cs

@@ -263,18 +263,8 @@ namespace PDF_Master.ViewModels.Tools
             }
             else
             {
-                //取消选中注释工具按钮后，恢复到未编辑注释的状态
-                PropertyPanel.IsAddLink = false;
-                //PropertyPanel.IsLocationLink = false;
-                PDFViewer.DisableClearSelectAnnot(false);
-                PDFViewer.ClearSelectAnnots();
-                PDFViewer.ToolManager.EnableClickCreate = false;
-                PDFViewer.SetMouseMode(MouseModes.PanTool);
-                ShowPropertyPanel(false);
-                if (string.IsNullOrEmpty(StrAnnotToolChecked))
-                {
-                    events.GetEvent<LinkAnnotTipCloseEvent>().Publish(new LinkAnnotTipCloseArgs() { UniCode = App.mainWindowViewModel.SelectedItem.Unicode });
-                }
+                
+                UncheckAnnot();
             }
 
             if (dictVar["isTemplateAnnot"] == false && annotArgs == null)
@@ -296,6 +286,22 @@ namespace PDF_Master.ViewModels.Tools
             }
         }
 
+        private void UncheckAnnot()
+        {
+            //取消选中注释工具按钮后，恢复到未编辑注释的状态
+            PropertyPanel.IsAddLink = false;
+            //PropertyPanel.IsLocationLink = false;
+            PDFViewer.DisableClearSelectAnnot(false);
+            PDFViewer.ClearSelectAnnots();
+            PDFViewer.ToolManager.EnableClickCreate = false;
+            PDFViewer.SetMouseMode(MouseModes.PanTool);
+            ShowPropertyPanel(false);
+            if (string.IsNullOrEmpty(StrAnnotToolChecked))
+            {
+                events.GetEvent<LinkAnnotTipCloseEvent>().Publish(new LinkAnnotTipCloseArgs() { UniCode = App.mainWindowViewModel.SelectedItem.Unicode });
+            }
+        }
+
         //选中注释工具按钮时，处理的一些系列事情
         private void MyToolCheckedDoing(Dictionary<string, bool> dict, string tag)
         {
@@ -2134,20 +2140,29 @@ namespace PDF_Master.ViewModels.Tools
                 }
 
                 AnnotHandlerEventArgs annotArgs = null;
-                StrAnnotToolChecked = tuple.Item2;
-                FindAnnotTypeKey(tuple.Item2, ref annotArgs);
-                if (annotArgs != null && tuple.Item2 != "Stamp")
-                {
-                    annotArgs.Author = Settings.Default.AppProperties.Description.Author;
-                    PDFViewer.SetMouseMode(MouseModes.AnnotCreate);
-                    PDFViewer.SetToolParam(annotArgs);
-                    PDFViewer.ToolManager.EnableClickCreate = false;
+                if(StrAnnotToolChecked== tuple.Item2)
+                {
+                    StrAnnotToolChecked = "";
+                    UncheckAnnot();
                 }
                 else
                 {
-                    //2023/4/6 设置Stamp刚进入时点击view出现空的选中方框
-                    PDFViewer.SetMouseMode(MouseModes.None);
-                }
+                    StrAnnotToolChecked = tuple.Item2;
+                    FindAnnotTypeKey(tuple.Item2, ref annotArgs);
+                    if (annotArgs != null && tuple.Item2 != "Stamp")
+                    {
+                        annotArgs.Author = Settings.Default.AppProperties.Description.Author;
+                        PDFViewer.SetMouseMode(MouseModes.AnnotCreate);
+                        PDFViewer.SetToolParam(annotArgs);
+                        PDFViewer.ToolManager.EnableClickCreate = false;
+                    }
+                    else
+                    {
+                        //2023/4/6 设置Stamp刚进入时点击view出现空的选中方框
+                        PDFViewer.SetMouseMode(MouseModes.None);
+                    }
+                }
+                
             }
         }