Merge branch 'dev' of http://git.kdan.cc:8865/Windows/PDFOffice_Windows_exe into dev

# Conflicts:
#	PDF Office/Views/Tools/AnnotToolContent.xaml

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

@@ -29,6 +29,7 @@ namespace PDF_Office.ViewModels.Tools
         public List<AnnotHandlerEventArgs> annotlists;
 
         public bool IsTextFill { get; private set; }
+
         public void SetIsTextFill(bool isTextFill)
         {
             IsTextFill = isTextFill;
@@ -66,7 +67,7 @@ namespace PDF_Office.ViewModels.Tools
         public static DashStyle GetLineDashStyle(bool isSolid)
         {
             DashStyle newDash = new DashStyle();
-            if(isSolid == false)
+            if (isSolid == false)
             {
                 newDash.Dashes.Add(2);
                 newDash.Dashes.Add(2);
@@ -248,7 +249,7 @@ namespace PDF_Office.ViewModels.Tools
         public IDialogService dialogs;
         public IRegionManager region;
 
-        private CPDFViewer PDFViewer;
+        public CPDFViewer PDFViewer;
         private ViewContentViewModel viewContentViewModel;
         private AnnotPropertyPanel propertyPanel = new AnnotPropertyPanel();
         private Dictionary<string, AnnotArgsType> ToolExpandDict = new Dictionary<string, AnnotArgsType>();
@@ -274,19 +275,24 @@ namespace PDF_Office.ViewModels.Tools
         public DelegateCommand<object> SetAddAnnotationCommand { get; set; }
         public DelegateCommand AddBookMarkCommand { get; set; }
 
+        public DelegateCommand<object> HandCommand { get; set; }
         #region 注释 - 右键菜单
+
         //公共
         public DelegateCommand<object> AnnotDefaultValue_MenuCommand { get; set; }
+
         public DelegateCommand<object> AnnotColorPalette_MenuCommand { get; set; }
         public DelegateCommand<object> AnnotAddNoteText_MenuCommand { get; set; }
+
         //高亮、下划线、删除
         public DelegateCommand<object> HightAnnotCopyText_MenuCommand { get; set; }
-        
+
         //手绘
         public DelegateCommand<object> FreeHandLineStyle_MenuCommand { get; set; }
 
         //文本
         public DelegateCommand<object> FreeTextFontFamily_MenuCommand { get; set; }
+
         public DelegateCommand<object> FreeTextAglin_MenuCommand { get; set; }
 
         //便签
@@ -294,10 +300,12 @@ namespace PDF_Office.ViewModels.Tools
 
         //形状
         public DelegateCommand<object> ShapeLineStyle_MenuCommand { get; set; }
+
         public DelegateCommand<object> ShapeLineDirect_MenuCommand { get; set; }
 
         //图章
         public DelegateCommand<object> StampExportPicture_MenuCommand { get; set; }
+
         #endregion 注释 - 右键菜单
 
         #endregion 事件

PDF Office/ViewModels/Tools/AnnotToolContentViewModel.cs

@@ -73,6 +73,7 @@ namespace PDF_Office.ViewModels.Tools
             SetAddAnnotationCommand = new DelegateCommand<object>(AddAnnotation_Click);
             AddBookMarkCommand = new DelegateCommand(AddBookMark_Click);
             PropertyRegionName = Guid.NewGuid().ToString();
+            HandCommand = new DelegateCommand<object>(Hand_Click);
 
             #region 注释 - 右键菜单
 
@@ -98,6 +99,23 @@ namespace PDF_Office.ViewModels.Tools
             #endregion 注释 - 右键菜单
         }
 
+        private void Hand_Click(object obj)
+        {
+            if (obj is WrapPanel wrapPanel)
+            {
+                foreach (var item in wrapPanel.Children)
+                {
+                    if (item is CustomIconToggleBtn customIconToggle)
+                    {
+                        customIconToggle.IsChecked = false;
+                    }
+                }
+                BtnHandIsChecked = true;
+                PDFViewer.SetMouseMode(MouseModes.PanTool);
+                viewContentViewModel.SelectedPrpoertyPanel("PropertyPanelContent", null);
+            }
+        }
+
         #endregion 初始化
 
         #region Command实现

PDF Office/Views/Tools/AnnotToolContent.xaml

@@ -52,7 +52,8 @@
                 HorizontalAlignment="Center">
                 <customControl:CustomIconToggleBtn
                     x:Name="BtnHand"
-                    Click="BtnHand_Click"
+                    Command="{Binding HandCommand}"
+                    CommandParameter="{Binding ElementName=ToolPanel}"
                     Foreground="Black"
                     IsChecked="{Binding BtnHandIsChecked}"
                     Style="{StaticResource ToggleBtnViewModeStyle}">

PDF Office/Views/Tools/AnnotToolContent.xaml.cs

@@ -1,4 +1,6 @@
-using PDF_Office.CustomControl;
+using ComPDFKitViewer.PdfViewer;
+using PDF_Office.CustomControl;
+using PDF_Office.ViewModels.Tools;
 using System;
 using System.Collections.Generic;
 using System.Linq;
@@ -28,7 +30,6 @@ namespace PDF_Office.Views.Tools
 
         private void BtnHand_Click(object sender, RoutedEventArgs e)
         {
-
         }
 
         private void BtnTool_Click(object sender, RoutedEventArgs e)
@@ -55,7 +56,6 @@ namespace PDF_Office.Views.Tools
 
         private void BtnBookMark_Click(object sender, RoutedEventArgs e)
         {
-
         }
     }
-}
+}