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

PDF Office/ViewModels/BOTA/SearchContentViewModel.cs

@@ -183,6 +183,7 @@ namespace PDF_Master.ViewModels.BOTA
                 {
                     return;
                 }
+                counter++;
             }
             //成功取消后，清除之前的结果，并搜索新内容
             SearchItemList.Clear();

PDF Office/ViewModels/Dialog/SignatureCreateDialogViewModel.cs

@@ -25,12 +25,18 @@ namespace PDF_Master.ViewModels.PropertyPanel.AnnotPanel
 {
     class SignatureCreateDialogViewModel : BindableBase, IDialogAware
     {
+        /// <summary>
+        /// 非绘制时展示的画笔光标
+        /// </summary>
+        private const double StrokeWidth= 3;
+        private const double StrokeHigh = 3;
         public string Title => "";
         private CPDFViewer PDFViewer;
         public event Action<IDialogResult> RequestClose;
         public DelegateCommand CancelCommand { get; set; }
 
         public DelegateCommand CreateCommnad { get; set; }
+        public DelegateCommand UpdataDrawingStrokesCommnad { get; set; }
 
         public DelegateCommand<object> CheckedCommnad { get; set; }
 
@@ -256,20 +262,22 @@ namespace PDF_Master.ViewModels.PropertyPanel.AnnotPanel
             ThicknessList = new ObservableCollection<string>() {"0.5pt", "1.0pt", "1.5pt", "2.0pt", "2.5pt", "3.0pt" };//改了这里记得去改ThicknessListIndex的Set方法里面的取值
             CancelCommand = new DelegateCommand(Cancel);
             CreateCommnad = new DelegateCommand(Create);
+            UpdataDrawingStrokesCommnad = new DelegateCommand(UpdataDrawingStrokes);
             CheckedCommnad = new DelegateCommand<object>(Checked);
             OpenImageCommnad = new DelegateCommand(OpenImage);
             ClearTextCommnad = new DelegateCommand(ClearText);
             ClearInkCanvasCommnad = new DelegateCommand(ClearInkCanvas);
             DrawingAttributeObject.Color = Colors.Black;
-            DrawingAttributeObject.Width = 1;
-            DrawingAttributeObject.Height = 1;
+            DrawingAttributeObject.Width = StrokeWidth;
+            DrawingAttributeObject.Height = StrokeHigh;
             WeakEventManager<StrokeCollection, StrokeCollectionChangedEventArgs>.AddHandler(StrokesObject, "StrokesChanged", StrokesObject_StrokesChanged);
             InitFontNameList();
         }
 
         private void StrokesObject_StrokesChanged(object sender, StrokeCollectionChangedEventArgs e)
         {
-            int x1 = 1;
+            DrawingAttributeObject.Width = StrokeWidth;
+            DrawingAttributeObject.Height = StrokeHigh;
         }
 
         private void InitFontNameList()
@@ -300,8 +308,9 @@ namespace PDF_Master.ViewModels.PropertyPanel.AnnotPanel
         {
             foreach (var item in StrokesObject)
             {
-                item.DrawingAttributes = DrawingAttributeObject;
+                item.DrawingAttributes = DrawingAttributeObject.Clone();
             }
+            DrawingAttributeObject.Width = DrawingAttributeObject.Height = 3;
         }
         private void ClearText()
         {
@@ -571,6 +580,14 @@ namespace PDF_Master.ViewModels.PropertyPanel.AnnotPanel
             RequestClose.Invoke(new DialogResult(ButtonResult.OK, valuePairs));
         }
 
+        /// <summary>
+        /// 绘制时使用的画笔
+        /// </summary>
+        private void UpdataDrawingStrokes()
+        {
+            DrawingAttributeObject.Width = DrawingAttributeObject.Height = Convert.ToDouble(ThicknessList[thicknessListIndex].Substring(0, 3));
+        }
+
         public bool CanCloseDialog()
         {
             return true;

PDF Office/Views/Dialog/SignatureCreateDialog.xaml.cs

@@ -55,6 +55,10 @@ namespace PDF_Master.Views.PropertyPanel.AnnotPanel
         private void inkCanvas_MouseLeftButtonDown(object sender, MouseButtonEventArgs e)
         {
             (DataContext as SignatureCreateDialogViewModel).IsMouseDown = true;
+            if ((DataContext as SignatureCreateDialogViewModel).UpdataDrawingStrokesCommnad.CanExecute())
+            {
+                (DataContext as SignatureCreateDialogViewModel).UpdataDrawingStrokesCommnad.Execute();
+            } 
         }
 
         private void inkCanvas_MouseLeftButtonUp(object sender, MouseButtonEventArgs e)