便签注释-预览图形改变

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

@@ -939,19 +939,25 @@ namespace PDF_Master.ViewModels.Tools
                         defaultAnnot.Opacity = 1;
                         SettingHelper.SetAnnotDefaultProperty(defaultAnnot);
                         Settings.Default.Save();
+                       
                     }
 
-                    stickyAnnotArgs.Transparency = defaultAnnot.Opacity;
+                    stickyAnnotArgs.Transparency = defaultAnnot.Opacity;
+                    //希望defaultAnnot里面可以缓存这个名字 2023/4/4
+                    stickyAnnotArgs.IconName = "Comment";
                 }
                 else
                 {
                     stickyAnnotArgs = PropertyPanel.LastAnnotDict[AnnotArgsType.AnnotSticky] as StickyAnnotArgs;
                     stickyAnnotArgs.Content = string.Empty;
                     stickyAnnotArgs.StickyNote = string.Empty;
+                    //希望defaultAnnot里面可以缓存这个名字 2023/4/4
+                    stickyAnnotArgs.IconName = "Comment";
                 }
 
                 if (stickyAnnotArgs != null)
-                {
+                {
+                    
                     selectedArgs = new List<AnnotHandlerEventArgs>();
                     selectedArgs.Add(stickyAnnotArgs);
                 }

PDF Office/Views/PropertyPanel/AnnotPanel/StickyNoteProperty.xaml.cs

@@ -2,6 +2,7 @@
 using PDF_Master.ViewModels.PropertyPanel.AnnotPanel;
 using System;
 using System.Collections.Generic;
+using System.ComponentModel;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
@@ -10,6 +11,7 @@ using System.Windows.Controls;
 using System.Windows.Data;
 using System.Windows.Documents;
 using System.Windows.Input;
+using System.Windows.Markup;
 using System.Windows.Media;
 using System.Windows.Media.Imaging;
 using System.Windows.Navigation;
@@ -89,28 +91,43 @@ namespace PDF_Master.Views.PropertyPanel.AnnotPanel
         {
             if(ViewModel != null)
             {
-                switch(ViewModel.strOtherTag)
+                var converter = TypeDescriptor.GetConverter(typeof(Geometry));
+                switch (ViewModel.strOtherTag)
                 {
                     case "Comment":
-                        BtnComment.IsChecked = true;
+                        BtnComment.IsChecked = true;
+                        var dataComment = ViewModel.StickyNoteTypes[ViewModel.strOtherTag];
+                        ViewModel.ExmpleData = (Geometry)converter.ConvertFrom(dataComment);
                         break;
                     case "Note":
                         BtnNote.IsChecked = true;
+                        var dataNote = ViewModel.StickyNoteTypes[ViewModel.strOtherTag];
+                        ViewModel.ExmpleData = (Geometry)converter.ConvertFrom(dataNote);
                         break;
                     case "Key":
                         BtnKey.IsChecked = true;
+                        var dataKey = ViewModel.StickyNoteTypes[ViewModel.strOtherTag];
+                        ViewModel.ExmpleData = (Geometry)converter.ConvertFrom(dataKey);
                         break;
                     case "Help":
                         BtnHelp.IsChecked = true;
+                        var dataHelp = ViewModel.StickyNoteTypes[ViewModel.strOtherTag];
+                        ViewModel.ExmpleData = (Geometry)converter.ConvertFrom(dataHelp);
                         break;
                     case "Insert":
                         BtnInsert.IsChecked = true;
+                        var dataInsert = ViewModel.StickyNoteTypes[ViewModel.strOtherTag];
+                        ViewModel.ExmpleData = (Geometry)converter.ConvertFrom(dataInsert);
                         break;
                     case "Paragraph":
                         BtnParagraph.IsChecked = true;
+                        var dataParagraph = ViewModel.StickyNoteTypes[ViewModel.strOtherTag];
+                        ViewModel.ExmpleData = (Geometry)converter.ConvertFrom(dataParagraph);
                         break;
                     case "NewParagraph":
                         BtnNewParagraph.IsChecked = true;
+                        var dataNewParagraph = ViewModel.StickyNoteTypes[ViewModel.strOtherTag];
+                        ViewModel.ExmpleData = (Geometry)converter.ConvertFrom(dataNewParagraph);
                         break;
                     case "None":
                         BtnComment.IsChecked = false;
@@ -123,6 +140,8 @@ namespace PDF_Master.Views.PropertyPanel.AnnotPanel
                         break;
                     default:
                         BtnComment.IsChecked = true;
+                        var datacomment = ViewModel.StickyNoteTypes["Comment"];
+                        ViewModel.ExmpleData = (Geometry)converter.ConvertFrom(datacomment);
                         break;
                 }
             }