【注释】文本注释，恢复默认预设样式后，文本字号不符合原始字体大小

PDF Office/Model/PropertyPanel/AnnotPanel/FontStyleItem.cs

@@ -135,7 +135,7 @@ namespace PDF_Master.Model.PropertyPanel.AnnotPanel
         {
             List<PresetFontItem> fontStyleList = new List<PresetFontItem>();
             PresetFontItem custom = new PresetFontItem();
-            custom.mTag = "custom";
+            custom.mTag = "Custom";
             custom.mTagContent = "自定义";
 
             custom.mFontSize = 24;

PDF Office/ViewModels/PropertyPanel/AnnotPanel/FreetextAnnotPropertyViewModel.cs

@@ -369,7 +369,7 @@ namespace PDF_Master.ViewModels.PropertyPanel.AnnotPanel
             if (FontVm.CurrentPresetFont != null)
             {
                 ContextMenu menu;
-                if (FontVm.CurrentPresetFont.ValueStr == "custom")
+                if (FontVm.CurrentPresetFont.ValueStr == "Custom")
                 {
                     menu = SelectAnnotContextMenu(false);
                 }
@@ -449,6 +449,9 @@ namespace PDF_Master.ViewModels.PropertyPanel.AnnotPanel
                         FontVm.GetCurrentFontFamily(currentItem.mFontFamily.ToString(), currentItem.mFontFamily.ToString());
                         FontVm.GetCurrentFontSize(currentItem.mFontSize);
                         FontVm.GetFontWeights_Style(currentItem.mFontStyle, currentItem.mFontWeight);
+
+                        FontVm.CurrentPresetFont = new ComboDataItem(defaulItem.mTag, defaulItem.mTagContent);
+                        SelectedPresetFont();
                     }
                 }
             }

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

@@ -126,7 +126,6 @@ namespace PDF_Master.ViewModels.Tools
             }
             if (e.ClickCount == 2)
             {
-
                 if (CurrentSelectedAnnot != null)
                 {
                     var type = CurrentSelectedAnnot.EventType;
@@ -148,10 +147,8 @@ namespace PDF_Master.ViewModels.Tools
                             Point pagePoint = new Point(0, 0);
                             //Todo:等黎总需要更新ComPDFKit.dll
                             //PDFViewer.ConvertViewPointToPage(point, out pageIndex, out pagePoint);
-                            if (pagePoint.X >= rect.Left  && pagePoint.X <= rect.Right  && pagePoint.Y >= rect.Top  && pagePoint.Y <= rect.Bottom)
+                            if (pagePoint.X >= rect.Left && pagePoint.X <= rect.Right && pagePoint.Y >= rect.Top && pagePoint.Y <= rect.Bottom)
                                 PopAnnotNoteText(CurrentSelectedAnnot);
-
-
                         }
                     }
 
@@ -160,7 +157,6 @@ namespace PDF_Master.ViewModels.Tools
                         (CurrentSelectedAnnot as StickyAnnotArgs).PopupEditWnd();
                     }
                 }
-
             }
         }
 
@@ -348,7 +344,6 @@ namespace PDF_Master.ViewModels.Tools
         {
             if (e != null)
             {
-               
                 CurrentSelectedAnnot = null;
                 var annot = e.AnnotItemsList[0];
                 if (annot != null)
@@ -373,6 +368,7 @@ namespace PDF_Master.ViewModels.Tools
                                     GetFreetext(e.AnnotItemsList);
                                     PDFViewer.SetToolParam(annot);
                                     break;
+
                                 case AnnotArgsType.AnnotSticky:
                                     customStickyPopup.GetCurrentAnnot = e.AnnotItemsList[0] as StickyAnnotArgs;
                                     customStickyPopup.GetPDFViewer = PDFViewer;
@@ -497,8 +493,8 @@ namespace PDF_Master.ViewModels.Tools
                     }
                     else
                     {
-                        if(propertyPanel.IsMultiSelected==false)
-                        viewContentViewModel.SelectedPrpoertyPanel("PropertyPanelContent", null);
+                        if (propertyPanel.IsMultiSelected)
+                            viewContentViewModel.SelectedPrpoertyPanel("PropertyPanelContent", null);
                     }
                 }
             }
@@ -632,7 +628,6 @@ namespace PDF_Master.ViewModels.Tools
             }
         }
 
-
         private void PreviewExcute(object sender, ExecutedRoutedEventArgs e)
         {
             if (e.Command == ApplicationCommands.Copy)
@@ -1237,7 +1232,6 @@ namespace PDF_Master.ViewModels.Tools
             }
         }
 
-
         private void CreateEraseArgs()
         {
             EraseArgs eraseArgs = new EraseArgs();

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

@@ -602,7 +602,6 @@ namespace PDF_Master.ViewModels.Tools
                         SettingHelper.SetAnnotDefaultProperty(defaultAnnot);
                         Settings.Default.Save();
                     }
-
                     freetextArgs.FontColor = defaultAnnot.ForgoundColor;
                     freetextArgs.LineColor = defaultAnnot.BorderColor;
                     freetextArgs.BgColor = defaultAnnot.BackgroundColor;
@@ -626,9 +625,11 @@ namespace PDF_Master.ViewModels.Tools
                 }
                 else
                 {
-                    freetextArgs = propertyPanel.LastAnnotDict[AnnotArgsType.AnnotFreeText] as FreeTextAnnotArgs;
-                    freetextArgs.Content = string.Empty;
-                    freetextArgs.TextContent= string.Empty;
+                    FreeTextAnnotArgs freeText = propertyPanel.LastAnnotDict[AnnotArgsType.AnnotFreeText] as FreeTextAnnotArgs;
+                    freetextArgs = SetFreetextArgs(freeText);
+                    //freetextArgs = SetFreetextArgs(freeText);
+                    //freetextArgs.Content = string.Empty;
+                    //freetextArgs.TextContent = string.Empty;
                 }
 
                 if (freetextArgs != null)
@@ -653,6 +654,23 @@ namespace PDF_Master.ViewModels.Tools
             return freetextArgs;
         }
 
+        private FreeTextAnnotArgs SetFreetextArgs(FreeTextAnnotArgs defaultAnnot)
+        {
+            FreeTextAnnotArgs freetextArgs = new FreeTextAnnotArgs();
+            freetextArgs.FontColor = defaultAnnot.FontColor;
+            freetextArgs.LineColor = defaultAnnot.LineColor;
+            freetextArgs.BgColor = defaultAnnot.BgColor;
+            freetextArgs.Transparency = defaultAnnot.Transparency;
+            freetextArgs.FontFamily = defaultAnnot.FontFamily;
+            freetextArgs.FontSize = defaultAnnot.FontSize;
+            freetextArgs.FontWeight = defaultAnnot.FontWeight;
+            freetextArgs.FontStyle = defaultAnnot.FontStyle;
+            freetextArgs.LineWidth = defaultAnnot.LineWidth;
+            freetextArgs.Align = defaultAnnot.Align;
+
+            return freetextArgs;
+        }
+
         private void SelectTextCreateAnnot(FreeTextAnnotArgs freeText)
         {
             List<TextSelectNode> selectList = PDFViewer.GetSelectTextInfo();
@@ -705,12 +723,10 @@ namespace PDF_Master.ViewModels.Tools
                 pageIndex = selectList[0].PageIndex;
             }
 
-
             if (selectList != null && selectList.Count > 0)
             {
                 foreach (TextSelectNode selectNode in selectList)
                 {
-
                     foreach (Rect rawRect in selectNode.RawRect)
                     {
                         clientRect.Union(rawRect);
@@ -816,8 +832,8 @@ namespace PDF_Master.ViewModels.Tools
                 else
                 {
                     stickyAnnotArgs = propertyPanel.LastAnnotDict[AnnotArgsType.AnnotSticky] as StickyAnnotArgs;
-                    stickyAnnotArgs.Content=string.Empty;   
-                    stickyAnnotArgs.StickyNote= string.Empty;
+                    stickyAnnotArgs.Content = string.Empty;
+                    stickyAnnotArgs.StickyNote = string.Empty;
                 }
 
                 if (stickyAnnotArgs != null)