注释-esc退出

PDF Office/ViewModels/Tools/AnnotToolContentViewModel.cs

@@ -210,7 +210,6 @@ namespace PDF_Master.ViewModels.Tools
 
             if (annotBtn.IsChecked == true)
             {
-                
                 PropertyPanel.AnnotSelect = StrAnnotToolChecked;
                 PropertyPanel.IsSharpAnnotSelected = true;
                 PropertyPanel.IsFreeHandSelected = true;
@@ -1695,12 +1694,7 @@ namespace PDF_Master.ViewModels.Tools
                         case AnnotArgsType.AnnotLine:
                         case AnnotArgsType.AnnotSquare:
                         case AnnotArgsType.AnnotCircle:
-                        //case AnnotArgsType.AnnotHighlight:
-                        //case AnnotArgsType.AnnotUnderline:
-                        //case AnnotArgsType.AnnotStrikeout:
-                        //case AnnotArgsType.AnnotStamp:
-                        //case AnnotArgsType.AnnotLink:
-                        //case AnnotArgsType.AnnotFreehand:
+
                         case AnnotArgsType.AnnotSticky:
                         case AnnotArgsType.AnnotFreeText:
                             Trace.WriteLine(StrAnnotToolChecked);
@@ -1711,7 +1705,13 @@ namespace PDF_Master.ViewModels.Tools
                             else { ExitAnnotationTool(); }
                             break;
 
-                        default:
+                        case AnnotArgsType.AnnotHighlight:
+                        case AnnotArgsType.AnnotUnderline:
+                        case AnnotArgsType.AnnotStrikeout:
+                        case AnnotArgsType.AnnotStamp:
+                        case AnnotArgsType.AnnotLink:
+                        case AnnotArgsType.AnnotFreehand:
+                            ExitAnnotationTool();
                             break;
                     }
                 }
@@ -1738,6 +1738,7 @@ namespace PDF_Master.ViewModels.Tools
 
         private void ExitAnnotationTool()
         {
+            PDFViewer.DisableClearSelectAnnot(false);
             PDFViewer.ClearSelectAnnots();
             StrAnnotToolChecked = "";
             PDFViewer.SetMouseMode(MouseModes.PanTool);