默认工具 PanTool，手型工具 Scroll

PDF Office/ViewModels/Dialog/FullScreenWindowViewModel.cs

@@ -112,7 +112,7 @@ namespace PDF_Master.ViewModels.Dialog
                     }
                 }
                 PDFViewer.Load();
-                PDFViewer.SetMouseMode(MouseModes.Default);
+                PDFViewer.SetMouseMode(MouseModes.PanTool);
             }
         }
 

PDF Office/ViewModels/EditTools/Background/BackgroundDocumentContentViewModel.cs

@@ -287,7 +287,7 @@ namespace PDF_Master.ViewModels.EditTools.Background
                     PDFViewer.SetAnnotInteraction(!PDFViewer.GetAnnotInteraction());
                     PDFViewer.Load();
                     PDFViewer.ChangeViewMode(ViewMode.Single);
-                    PDFViewer.SetMouseMode(MouseModes.Default);
+                    PDFViewer.SetMouseMode(MouseModes.PanTool);
                     PageRangeNumber = PDFViewer.Document.PageCount;
                     PDFViewer.Zoom(0.5);
                 }

PDF Office/ViewModels/EditTools/Bates/BatesDocumentContentViewModel.cs

@@ -256,7 +256,7 @@ namespace PDF_Master.ViewModels.EditTools.Bates
                 PDFViewer.SetAnnotInteraction(!PDFViewer.GetAnnotInteraction());
                 PDFViewer.Load();
                 PDFViewer.ChangeViewMode(ViewMode.Single);
-                PDFViewer.SetMouseMode(MouseModes.Default);
+                PDFViewer.SetMouseMode(MouseModes.PanTool);
                 PageRangeNumber = PDFViewer.Document.PageCount;
                 PDFViewer.Zoom(0.5);
             }

PDF Office/ViewModels/EditTools/HeaderFooter/HeaderFooterDocumentContentViewModel.cs

@@ -271,7 +271,7 @@ namespace PDF_Master.ViewModels.EditTools.HeaderFooter
                     PDFViewer.SetAnnotInteraction(!PDFViewer.GetAnnotInteraction());
                     PDFViewer.Load();
                     PDFViewer.ChangeViewMode(ViewMode.Single);
-                    PDFViewer.SetMouseMode(MouseModes.Default);
+                    PDFViewer.SetMouseMode(MouseModes.PanTool);
                     PageRangeNumber = PDFViewer.Document.PageCount;
                     PDFViewer.Zoom(0.5);
                 }

PDF Office/ViewModels/EditTools/Redaction/RedactionContentViewModel.cs

@@ -443,7 +443,7 @@ namespace PDF_Master.ViewModels.EditTools.Redaction
 
             if(isClose)
             {
-                PDFViewer.SetMouseMode(MouseModes.Default);
+                PDFViewer.SetMouseMode(MouseModes.PanTool);
                 redactionRegion.Regions[RegionNames.ViwerRegionName].Remove(PDFViewer);
                 redactionRegion.Regions[RedactionDocumentRegionName].Remove(PDFViewer);
                 this.eventAggregator.GetEvent<CloseEditToolEvent>().Publish(new EnumCloseModeUnicode { Unicode = this.Unicode, Status = EnumCloseMode.StatusCancel });

PDF Office/ViewModels/EditTools/Watermark/WatermarkDocumentContentViewModel.cs

@@ -319,7 +319,7 @@ namespace PDF_Master.ViewModels.EditTools.Watermark
                     PDFViewer.SetAnnotInteraction(!PDFViewer.GetAnnotInteraction());
                     PDFViewer.Load();
                     PDFViewer.ChangeViewMode(ViewMode.Single);
-                    PDFViewer.SetMouseMode(MouseModes.Default);
+                    PDFViewer.SetMouseMode(MouseModes.PanTool);
                     eventAggregator.GetEvent<CurrentWatermarkPDFViewerEvent>().Publish(new CPDFViewerUnicode
                     {
                         Unicode = Unicode,

PDF Office/ViewModels/Tools/AnnotToolContentViewModel.cs

@@ -206,6 +206,7 @@ namespace PDF_Master.ViewModels.Tools
                 propertyPanel.IsAddLink = false;
                 propertyPanel.IsLocationLink = false;
                 PDFViewer.ToolManager.EnableClickCreate = false;
+                PDFViewer.SetMouseMode(MouseModes.PanTool);
                 ShowPropertyPanel(false);
             }
 

PDF Office/ViewModels/ViewContentViewModel.cs

@@ -252,7 +252,9 @@ namespace PDF_Master.ViewModels
 
         //若point不赋值或从列表中找不到point，系统会提供默认值为(0,0)的新point，所以改用Tuple<int,int>
         public List<FillAndSignIsShape> FillAndSign = new List<FillAndSignIsShape>();
+
         public List<Tuple<int, int>> AnnotSignatures = new List<Tuple<int, int>>();
+
         /// <summary>
         /// 文档的密码
         /// </summary>
@@ -863,9 +865,9 @@ namespace PDF_Master.ViewModels
 
             if ((bool)dialog.ShowDialog())
             {
-                for(int i=0;i<dialog.FileNames.Length;i++)
+                for (int i = 0; i < dialog.FileNames.Length; i++)
                 {
-                    if(App.OpenedFileList.Contains(dialog.FileNames[i]))
+                    if (App.OpenedFileList.Contains(dialog.FileNames[i]))
                     {
                         App.mainWindowViewModel.SelectItem(dialog.FileNames[i]);
                     }
@@ -1881,6 +1883,10 @@ namespace PDF_Master.ViewModels
         /// <param name="annotPropertyPanel"></param>
         public void SelectedPrpoertyPanel(string Content, AnnotTransfer annotPropertyPanel)
         {
+            if (Content == "PropertyPanelContent")
+            {
+                IsPropertyOpen = false;
+            }
             NavigationParameters parameters = new NavigationParameters();
             //传其他参数：文档类，空注释面板；
             parameters.Add(ParameterNames.PDFViewer, PDFViewer);
@@ -1899,7 +1905,7 @@ namespace PDF_Master.ViewModels
             CanSave = PDFViewer.UndoManager.CanSave;
             CanUndo = PDFViewer.UndoManager.CanUndo;
             CanRedo = PDFViewer.UndoManager.CanRedo;
-            if (passwordInfo != null&&(!string.IsNullOrEmpty(passwordInfo.OpenPassword)||!string.IsNullOrEmpty(passwordInfo.PermissionsPassword)))
+            if (passwordInfo != null && (!string.IsNullOrEmpty(passwordInfo.OpenPassword) || !string.IsNullOrEmpty(passwordInfo.PermissionsPassword)))
             {
                 if (!string.IsNullOrEmpty(passwordInfo.OpenPassword))
                 {
@@ -2264,7 +2270,6 @@ namespace PDF_Master.ViewModels
                         App.OpenedFileList.Remove(oldpath);
                         DoAfterSaveAs(dlg.FileName);
                     }
-
                     else
                     {
                         //提示文件被其他软件占用 无法保存