Explorar el Código

注释-优化调整

OYXH\oyxh hace 1 año
padre
commit
82f133b51f

+ 11 - 5
PDF Office/ViewModels/Tools/AnnotToolContentViewModel.Command.cs

@@ -6,6 +6,7 @@ using ComPDFKit.PDFPage;
 using ComPDFKitViewer;
 using ComPDFKitViewer.AnnotEvent;
 using ComPDFKitViewer.PdfViewer;
+using DryIoc;
 using ImTools;
 using PDF_Master.CustomControl;
 using PDF_Master.EventAggregators;
@@ -167,11 +168,11 @@ namespace PDF_Master.ViewModels.Tools
                 //PropertyPanel.IsFreeHandSelected = true;
                 //PDFViewer.ClearSelectAnnots();
 
-                if (StrAnnotToolChecked == "Stamp")
-                {
-                    GetStamp();
-                    //PDFViewer.SetMouseMode(MouseModes.None);
-                }
+                //注释工具 选中图章,阅读页选择其他注释后,点击阅读页空白,属性面板需要显示图章面板
+                //if (StrAnnotToolChecked == "Stamp")
+                //{
+                //    GetStamp();
+                //}
 
                 //AnnotHandlerEventArgs annotArgs = CurrentSelectedAnnot;
 
@@ -647,6 +648,11 @@ namespace PDF_Master.ViewModels.Tools
                     {
                         CleanPropertyPanel();
                     }
+                    //注释工具 选中图章,阅读页选择其他注释后,点击阅读页空白,属性面板需要显示图章面板
+                    if (StrAnnotToolChecked == "Stamp")
+                    {
+                        GetStamp();
+                    }
                 }
             }
 

+ 1 - 1
PDF Office/ViewModels/Tools/AnnotToolContentViewModel.cs

@@ -252,7 +252,7 @@ namespace PDF_Master.ViewModels.Tools
                     //2023/4/6 设置Stamp刚进入时点击view出现空的选中方框
                     //PDFViewer.SetMouseMode(MouseModes.None);
 
-                    //解决 注释 工具 图章,不选中注释的bug
+                    //解决 注释 工具 图章,不选中其他注释的bug
                     PDFViewer.SetMouseMode(MouseModes.AnnotCreate);
                     PDFViewer.SetToolParam(new SelectToolArgs());
                 }