综合-注释

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

@@ -568,11 +568,11 @@ namespace PDF_Master.ViewModels.Tools
         {
             var list = e.GetPageAnnotsIndex();
             bool isTabItemAnnotation = IsBOTATabItemShow(out BOTAContentViewModel bOTAContentViewModel, out BOTAContent bOTAContent, "TabItemAnnotation");
-            if (viewContentViewModel.OpenBOTA == false || isTabItemAnnotation == false || bOTAContent.TabItemAnnotation.IsSelected == false)
-            {
-                viewContentViewModel.OpenBOTA = true;
-                bOTAContent.TabItemAnnotation.IsSelected = true;
-            }
+            //if (viewContentViewModel.OpenBOTA == false || isTabItemAnnotation == false || bOTAContent.TabItemAnnotation.IsSelected == false)
+            //{
+            //    viewContentViewModel.OpenBOTA = true;
+            //    bOTAContent.TabItemAnnotation.IsSelected = true;
+            //}
             if (viewContentViewModel.OpenBOTA == true && isTabItemAnnotation == true && bOTAContent.TabItemAnnotation.IsSelected == true && list != null && list.Count > 0)
             {
                 if (list.Keys.Count == 0)

PDF Office/ViewModels/Tools/AnnotToolContentViewModel.cs

@@ -1580,9 +1580,12 @@ namespace PDF_Master.ViewModels.Tools
                 //BtnHandIsChecked = true;
 
                 PDFViewer.ClearSelectAnnots();
-                StrAnnotToolChecked = "";
+                //StrAnnotToolChecked = "";
+                //ShowPropertyPanel(false);
+                //PDFViewer.SetMouseMode(MouseModes.PanTool);
+                HandToolIsCheckedEvent(false);
+                BtnHandIsChecked = false;
                 ShowPropertyPanel(false);
-                PDFViewer.SetMouseMode(MouseModes.PanTool);
             }
             else if (KeyEventsHelper.IsModifierKey(ModifierKeys.Shift, Key.None))
             {