阅读模式-优化

PDF Office/ViewModels/PropertyPanel/ViewModular/PageContentViewModel.cs

@@ -1,4 +1,5 @@
 using ComPDFKitViewer;
+using ComPDFKitViewer.AnnotEvent;
 using ComPDFKitViewer.PdfViewer;
 using Microsoft.Office.Interop.Word;
 using PDF_Master.Model;
@@ -288,6 +289,9 @@ namespace PDF_Master.ViewModels.PropertyPanel.ViewModular
                     PageCount = PDFViewer.Document.PageCount;
                     CurrentPage = PDFViewer.CurrentIndex + 1;
                     this.PDFViewer.InfoChanged += PDFViewer_InfoChanged;
+                    PDFViewer.SetMouseMode(MouseModes.PanTool);
+                    var annotArgs = new SelectToolArgs();
+                    PDFViewer.SetToolParam(annotArgs);
                 }
             }
         }

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

@@ -148,7 +148,12 @@ namespace PDF_Master.ViewModels.Tools
             {
                 //不禁止取消选中注释
                 PDFViewer.DisableClearSelectAnnot(false);
-
+                if (viewContentViewModel.mainViewModel.IsBookMode)
+                {
+                    PDFViewer.SetMouseMode(MouseModes.PanTool);
+                    var annotArgs = new SelectToolArgs();
+                    PDFViewer.SetToolParam(annotArgs);
+                }
                 //PropertyPanel.IsSharpAnnotSelected = true;
                 //PropertyPanel.IsFreeHandSelected = true;
                 //PDFViewer.ClearSelectAnnots();
@@ -514,13 +519,14 @@ namespace PDF_Master.ViewModels.Tools
                                 PropertyPanel.IsFreeHandSelected = true;
                             }
                             isShowPropertyPanel = viewContentViewModel.IsPropertyOpen;
+                            if(viewContentViewModel.mainViewModel.IsBookMode == false)
                             GetSelectedAnnots(e);
 
                             SelectedSignature(e.AnnotItemsList);
 
                             if (Settings.Default.AppProperties.InitialVIew.AutoExpandProperty
                                 && annot.EventType != AnnotArgsType.AnnotStamp && StrAnnotToolChecked != "Signature"
-                                && annot.EventType != AnnotArgsType.AnnotLink)
+                                && annot.EventType != AnnotArgsType.AnnotLink && viewContentViewModel.mainViewModel.IsBookMode==false)
                             {
                                 var signAnnot = viewContentViewModel.AnnotSignatures.FirstOrDefault(temp => temp.Item1 == annot.PageIndex && temp.Item2 == annot.AnnotIndex);
                                 if (signAnnot == null)

PDF Office/ViewModels/ViewContentViewModel.cs

@@ -1853,7 +1853,8 @@ namespace PDF_Master.ViewModels
             PDFViewer.DisableClearSelectAnnot(false);
             PDFViewer.ClearSelectAnnots();
             PDFViewer.SetMouseMode(MouseModes.PanTool);
-
+            var annotArgs = new SelectToolArgs();
+            PDFViewer.SetToolParam(annotArgs);
             #region 旧版本
 
             //NavigationParameters param = new NavigationParameters();
@@ -1904,6 +1905,7 @@ namespace PDF_Master.ViewModels
             ShowTip(true);
             await Task.Delay(3000);
             TipVisible = Visibility.Collapsed;
+            
         }
 
         /// <summary>

PDF Office/Views/ViewContent.xaml.cs

@@ -1,4 +1,5 @@
 using ComPDFKitViewer;
+using ComPDFKitViewer.AnnotEvent;
 using ComPDFKitViewer.PdfViewer;
 using PDF_Master.EventAggregators;
 using PDF_Master.Helper;
@@ -95,7 +96,8 @@ namespace PDF_Master.Views
                 Grid.SetRow(DocumentView, 0);
                 Grid.SetColumnSpan(GridViewer, 4);
                 Grid.SetColumn(GridViewer, 0);
-
+                var annotArgs = new SelectToolArgs();
+                viewModel.PDFViewer.SetToolParam(annotArgs);
                 #region to do
 
                 //Grid.SetRowSpan(RectangleBota, 4);
@@ -113,8 +115,9 @@ namespace PDF_Master.Views
                 Grid.SetRowSpan(DocumentView, 1);
                 Grid.SetRow(DocumentView, 2);
                 Grid.SetColumn(GridViewer, 2);
-                Grid.SetColumnSpan(GridViewer, 1);
-
+                Grid.SetColumnSpan(GridViewer, 1);
+                var annotArgs = new SelectToolArgs();
+                viewModel.PDFViewer.SetToolParam(annotArgs);
                 #region to do
 
                 //Grid.SetRowSpan(RectangleBota, 1);