Browse Source

文本注释-预设重新定义优化

OYXH\oyxh 1 year ago
parent
commit
4bed801f3b

+ 1 - 0
PDF Office/ViewModels/PropertyPanel/AnnotPanel/FreetextAnnotPropertyViewModel.cs

@@ -652,6 +652,7 @@ namespace PDF_Master.ViewModels.PropertyPanel.AnnotPanel
 
             FontVm.CurrentPresetFont = new ComboDataItem(item.mTag, item.mTagContent);
             SelectedPresetFont();
+
             if (BasicVm.IsMultiSelected == false)
                 PropertyPanel.InvokeToMyTools(BasicVm.AnnotType, Annot);
 

+ 25 - 9
PDF Office/ViewModels/Tools/AnnotToolContentViewModel.Command.cs

@@ -2096,16 +2096,32 @@ namespace PDF_Master.ViewModels.Tools
 
                             break;
 
-                        case AnnotArgsType.AnnotFreeText:
+                            //预设 重新定义后 会将文本内容  带上
+                            //case AnnotArgsType.AnnotFreeText:
 
-                            if (PropertyPanel != null && PropertyPanel.annot != null && PDFViewer.MouseMode == MouseModes.AnnotCreate)
-                            {
-                                if (StrAnnotToolChecked == key.Key)
-                                {
-                                    PDFViewer.SetToolParam(PropertyPanel.annot);
-                                }
-                            }
-                            break;
+                            //    if (PropertyPanel != null && PropertyPanel.annot != null && PDFViewer.MouseMode == MouseModes.AnnotCreate)
+                            //    {
+                            //        if (StrAnnotToolChecked == key.Key)
+                            //        {
+                            //            if (PropertyPanel.annot is FreeTextAnnotArgs defaultAnnot)
+                            //            {
+                            //                FreeTextAnnotArgs freetextArgs = new FreeTextAnnotArgs();
+                            //                freetextArgs.FontColor = defaultAnnot.FontColor;
+                            //                freetextArgs.LineColor = defaultAnnot.LineColor;
+                            //                freetextArgs.BgColor = defaultAnnot.BgColor;
+                            //                freetextArgs.Transparency = defaultAnnot.Transparency;
+                            //                freetextArgs.FontName = defaultAnnot.FontName;
+                            //                freetextArgs.FontSize = defaultAnnot.FontSize;
+                            //                freetextArgs.IsBold = defaultAnnot.IsBold;
+                            //                freetextArgs.IsItalic = defaultAnnot.IsItalic;
+                            //                freetextArgs.LineWidth = defaultAnnot.LineWidth;
+                            //                freetextArgs.Align = defaultAnnot.Align;
+
+                            //                PDFViewer.SetToolParam(defaultAnnot);
+                            //            }
+                            //        }
+                            //    }
+                            //    break;
                     }
                 }
             }