【注释】添加文字时使用默认样式添加

PDF Office/PDF Master.xcodeproj/project.pbxproj

@@ -1153,9 +1153,6 @@
 		AD3A3587294C11ED00D72802 /* KMPrintPreviewPresenter.swift in Sources */ = {isa = PBXBuildFile; fileRef = AD3A3586294C11ED00D72802 /* KMPrintPreviewPresenter.swift */; };
 		AD3A3588294C11ED00D72802 /* KMPrintPreviewPresenter.swift in Sources */ = {isa = PBXBuildFile; fileRef = AD3A3586294C11ED00D72802 /* KMPrintPreviewPresenter.swift */; };
 		AD3A3589294C11ED00D72802 /* KMPrintPreviewPresenter.swift in Sources */ = {isa = PBXBuildFile; fileRef = AD3A3586294C11ED00D72802 /* KMPrintPreviewPresenter.swift */; };
-		AD3C6DFC2A1C488C0010B1A7 /* KMEditPDFTextManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = AD3C6DFB2A1C488C0010B1A7 /* KMEditPDFTextManager.swift */; };
-		AD3C6DFD2A1C488C0010B1A7 /* KMEditPDFTextManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = AD3C6DFB2A1C488C0010B1A7 /* KMEditPDFTextManager.swift */; };
-		AD3C6DFE2A1C488C0010B1A7 /* KMEditPDFTextManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = AD3C6DFB2A1C488C0010B1A7 /* KMEditPDFTextManager.swift */; };
 		AD44D652292C9E7900A94554 /* KMImageToPDFChooseView.swift in Sources */ = {isa = PBXBuildFile; fileRef = AD44D651292C9E7900A94554 /* KMImageToPDFChooseView.swift */; };
 		AD44D653292C9E7900A94554 /* KMImageToPDFChooseView.swift in Sources */ = {isa = PBXBuildFile; fileRef = AD44D651292C9E7900A94554 /* KMImageToPDFChooseView.swift */; };
 		AD44D654292C9E7900A94554 /* KMImageToPDFChooseView.swift in Sources */ = {isa = PBXBuildFile; fileRef = AD44D651292C9E7900A94554 /* KMImageToPDFChooseView.swift */; };
@@ -1186,9 +1183,6 @@
 		AD53B70529ACC65500D61E81 /* KMMailHelper.m in Sources */ = {isa = PBXBuildFile; fileRef = AD53B70429ACC65500D61E81 /* KMMailHelper.m */; };
 		AD53B70629ACC65500D61E81 /* KMMailHelper.m in Sources */ = {isa = PBXBuildFile; fileRef = AD53B70429ACC65500D61E81 /* KMMailHelper.m */; };
 		AD53B70729ACC65500D61E81 /* KMMailHelper.m in Sources */ = {isa = PBXBuildFile; fileRef = AD53B70429ACC65500D61E81 /* KMMailHelper.m */; };
-		AD58C0F82A1F2D3600F911A0 /* KMImageOptimization.swift in Sources */ = {isa = PBXBuildFile; fileRef = AD58C0F72A1F2D3600F911A0 /* KMImageOptimization.swift */; };
-		AD58C0F92A1F2D3600F911A0 /* KMImageOptimization.swift in Sources */ = {isa = PBXBuildFile; fileRef = AD58C0F72A1F2D3600F911A0 /* KMImageOptimization.swift */; };
-		AD58C0FA2A1F2D3600F911A0 /* KMImageOptimization.swift in Sources */ = {isa = PBXBuildFile; fileRef = AD58C0F72A1F2D3600F911A0 /* KMImageOptimization.swift */; };
 		AD68782129A5FADC005B5210 /* KMLightMemberCache.swift in Sources */ = {isa = PBXBuildFile; fileRef = AD68782029A5FADC005B5210 /* KMLightMemberCache.swift */; };
 		AD68782229A5FADC005B5210 /* KMLightMemberCache.swift in Sources */ = {isa = PBXBuildFile; fileRef = AD68782029A5FADC005B5210 /* KMLightMemberCache.swift */; };
 		AD68782329A5FADC005B5210 /* KMLightMemberCache.swift in Sources */ = {isa = PBXBuildFile; fileRef = AD68782029A5FADC005B5210 /* KMLightMemberCache.swift */; };
@@ -1327,6 +1321,12 @@
 		ADA08A8A29F21A53009B2A7B /* KMPDFViewAnnotationOnceModeStore.swift in Sources */ = {isa = PBXBuildFile; fileRef = ADA08A8929F21A53009B2A7B /* KMPDFViewAnnotationOnceModeStore.swift */; };
 		ADA08A8B29F21A53009B2A7B /* KMPDFViewAnnotationOnceModeStore.swift in Sources */ = {isa = PBXBuildFile; fileRef = ADA08A8929F21A53009B2A7B /* KMPDFViewAnnotationOnceModeStore.swift */; };
 		ADA08A8C29F21A53009B2A7B /* KMPDFViewAnnotationOnceModeStore.swift in Sources */ = {isa = PBXBuildFile; fileRef = ADA08A8929F21A53009B2A7B /* KMPDFViewAnnotationOnceModeStore.swift */; };
+		ADA9102A2A272CE2003352F0 /* KMEditPDFTextManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = ADA910292A272CE2003352F0 /* KMEditPDFTextManager.swift */; };
+		ADA9102B2A272CE2003352F0 /* KMEditPDFTextManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = ADA910292A272CE2003352F0 /* KMEditPDFTextManager.swift */; };
+		ADA9102C2A272CE2003352F0 /* KMEditPDFTextManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = ADA910292A272CE2003352F0 /* KMEditPDFTextManager.swift */; };
+		ADA9102E2A272CEA003352F0 /* KMImageOptimization.swift in Sources */ = {isa = PBXBuildFile; fileRef = ADA9102D2A272CEA003352F0 /* KMImageOptimization.swift */; };
+		ADA9102F2A272CEA003352F0 /* KMImageOptimization.swift in Sources */ = {isa = PBXBuildFile; fileRef = ADA9102D2A272CEA003352F0 /* KMImageOptimization.swift */; };
+		ADA910302A272CEA003352F0 /* KMImageOptimization.swift in Sources */ = {isa = PBXBuildFile; fileRef = ADA9102D2A272CEA003352F0 /* KMImageOptimization.swift */; };
 		ADB1FE28297006DF00ED072D /* KMBatchWindowController.swift in Sources */ = {isa = PBXBuildFile; fileRef = ADB1FE26297006DF00ED072D /* KMBatchWindowController.swift */; };
 		ADB1FE29297006DF00ED072D /* KMBatchWindowController.swift in Sources */ = {isa = PBXBuildFile; fileRef = ADB1FE26297006DF00ED072D /* KMBatchWindowController.swift */; };
 		ADB1FE2A297006DF00ED072D /* KMBatchWindowController.swift in Sources */ = {isa = PBXBuildFile; fileRef = ADB1FE26297006DF00ED072D /* KMBatchWindowController.swift */; };
@@ -3855,7 +3855,6 @@
 		AD2D74B429F0D39500EDC5E4 /* KMCancellationSuccessView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = KMCancellationSuccessView.swift; sourceTree = "<group>"; };
 		AD2D74B829F0D3A100EDC5E4 /* KMCancellationSuccessView.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = KMCancellationSuccessView.xib; sourceTree = "<group>"; };
 		AD3A3586294C11ED00D72802 /* KMPrintPreviewPresenter.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = KMPrintPreviewPresenter.swift; sourceTree = "<group>"; };
-		AD3C6DFB2A1C488C0010B1A7 /* KMEditPDFTextManager.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = KMEditPDFTextManager.swift; sourceTree = "<group>"; };
 		AD44D651292C9E7900A94554 /* KMImageToPDFChooseView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = KMImageToPDFChooseView.swift; sourceTree = "<group>"; };
 		AD44D655292C9E8C00A94554 /* KMImageToPDFChooseView.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = KMImageToPDFChooseView.xib; sourceTree = "<group>"; };
 		AD4B4547293ED7DA0076FA14 /* KMImageToPDFManager.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = KMImageToPDFManager.swift; sourceTree = "<group>"; };
@@ -3867,7 +3866,6 @@
 		AD53B6FD29AC5FCD00D61E81 /* KMLightMemberToken.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = KMLightMemberToken.swift; sourceTree = "<group>"; };
 		AD53B70329ACC65500D61E81 /* KMMailHelper.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = KMMailHelper.h; sourceTree = "<group>"; };
 		AD53B70429ACC65500D61E81 /* KMMailHelper.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = KMMailHelper.m; sourceTree = "<group>"; };
-		AD58C0F72A1F2D3600F911A0 /* KMImageOptimization.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = KMImageOptimization.swift; sourceTree = "<group>"; };
 		AD68782029A5FADC005B5210 /* KMLightMemberCache.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = KMLightMemberCache.swift; sourceTree = "<group>"; };
 		AD68783229A60FA7005B5210 /* KMLoginView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = KMLoginView.swift; sourceTree = "<group>"; };
 		AD68783729A60FC0005B5210 /* KMLoginView.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = KMLoginView.xib; sourceTree = "<group>"; };
@@ -3914,6 +3912,8 @@
 		ADA08A7C29F13EA0009B2A7B /* ComPDFKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = ComPDFKit.framework; sourceTree = "<group>"; };
 		ADA08A8029F13EE1009B2A7B /* ComPDFKit_Conversion.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = ComPDFKit_Conversion.framework; sourceTree = "<group>"; };
 		ADA08A8929F21A53009B2A7B /* KMPDFViewAnnotationOnceModeStore.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = KMPDFViewAnnotationOnceModeStore.swift; sourceTree = "<group>"; };
+		ADA910292A272CE2003352F0 /* KMEditPDFTextManager.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = KMEditPDFTextManager.swift; sourceTree = "<group>"; };
+		ADA9102D2A272CEA003352F0 /* KMImageOptimization.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = KMImageOptimization.swift; sourceTree = "<group>"; };
 		ADB1FE26297006DF00ED072D /* KMBatchWindowController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = KMBatchWindowController.swift; sourceTree = "<group>"; };
 		ADB1FE27297006DF00ED072D /* KMBatchWindowController.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = KMBatchWindowController.xib; sourceTree = "<group>"; };
 		ADB1FE30297008E800ED072D /* KMBatchCollectionView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = KMBatchCollectionView.swift; sourceTree = "<group>"; };
@@ -5883,7 +5883,7 @@
 		AD3C6DFA2A1C48600010B1A7 /* Manager */ = {
 			isa = PBXGroup;
 			children = (
-				AD3C6DFB2A1C488C0010B1A7 /* KMEditPDFTextManager.swift */,
+				ADA910292A272CE2003352F0 /* KMEditPDFTextManager.swift */,
 			);
 			path = Manager;
 			sourceTree = "<group>";
@@ -5963,7 +5963,7 @@
 		AD58C0FB2A1F2D3C00F911A0 /* Category */ = {
 			isa = PBXGroup;
 			children = (
-				AD58C0F72A1F2D3600F911A0 /* KMImageOptimization.swift */,
+				ADA9102D2A272CEA003352F0 /* KMImageOptimization.swift */,
 			);
 			path = Category;
 			sourceTree = "<group>";
@@ -10391,6 +10391,7 @@
 				9FDD0F802952FC36000C4DAD /* KMDesignToken.swift in Sources */,
 				896DD46729893B9900ADE514 /* KMSplitView.m in Sources */,
 				BBFE6E582930724B00142C01 /* KMMergePageModel.swift in Sources */,
+				ADA9102A2A272CE2003352F0 /* KMEditPDFTextManager.swift in Sources */,
 				BB897229294B08720045787C /* KMWatermarkAdjectiveTopBarItemModel.swift in Sources */,
 				BB00301D298CB799002DD1A0 /* KMPreferenceManager.swift in Sources */,
 				89E93EFA299CB4C200F10F66 /* KMOCRBox.m in Sources */,
@@ -10542,7 +10543,6 @@
 				BB162E92294FFE020088E9D1 /* KMWatermarkModel.swift in Sources */,
 				9FDD0F842952FC9C000C4DAD /* KMAliasLightParser.swift in Sources */,
 				BBFE6E5D2930809A00142C01 /* KMMergeCollectionPageViewItem.swift in Sources */,
-				AD58C0F82A1F2D3600F911A0 /* KMImageOptimization.swift in Sources */,
 				89E4E7132963D7FF002DBA6F /* NSFont_SKExtensions.m in Sources */,
 				89316849296E436B0073EA59 /* KMSignatureManager.m in Sources */,
 				BB147005299DC0D100784A6A /* OIDFieldMapping.m in Sources */,
@@ -10769,7 +10769,6 @@
 				BBA93D2D29BEBAA60044E0DD /* KMPreferenceEnum.swift in Sources */,
 				BB89DD7E2953F863007C3FFA /* KMWatermarkFileOutsideView.swift in Sources */,
 				ADE8BC3E29F9458700570F89 /* KMRecommondInfo.m in Sources */,
-				AD3C6DFC2A1C488C0010B1A7 /* KMEditPDFTextManager.swift in Sources */,
 				AD9527C6295295110039D2BC /* KMPrintPrinterModel.swift in Sources */,
 				BB146FE4299DC0D100784A6A /* GTLRURITemplate.m in Sources */,
 				9F1FE50D29407B2B00E952CA /* KMUploadFilePanel.swift in Sources */,
@@ -10827,6 +10826,7 @@
 				AD53B6FE29AC5FCD00D61E81 /* KMLightMemberToken.swift in Sources */,
 				BB0542152965705D00F2665C /* KMCropTipView.swift in Sources */,
 				896DD4552985FB3200ADE514 /* KMPageDisplayThemeCollectionViewItem.swift in Sources */,
+				ADA9102E2A272CEA003352F0 /* KMImageOptimization.swift in Sources */,
 				BBC348532958465C008D2CD1 /* KMBackgroundFilePropertyInfoController.swift in Sources */,
 				AD9527C2295294EF0039D2BC /* KMPrintPaperModel.swift in Sources */,
 				89E93EFF299CBDEE00F10F66 /* KMOCRComboBox.m in Sources */,
@@ -10997,6 +10997,7 @@
 				BB86C1EE28F544F4005AD968 /* CPDFListView+Event.m in Sources */,
 				9F81ADC729B9B12C002251F4 /* NSButton+DesignToken.swift in Sources */,
 				BBEC00C8295C319400A26C98 /* KMBatesManager.swift in Sources */,
+				ADA9102B2A272CE2003352F0 /* KMEditPDFTextManager.swift in Sources */,
 				BB147021299DC0D100784A6A /* OIDServiceDiscovery.m in Sources */,
 				BB5DF1F22959C9F00025CDA1 /* KMHeaderFooterPropertyMainController.swift in Sources */,
 				BBC3482529559506008D2CD1 /* KMBackgroundManager.swift in Sources */,
@@ -11173,6 +11174,7 @@
 				9F1FE4A929406E4700E952CA /* CTBrowserWindowController.m in Sources */,
 				BB00301E298CB799002DD1A0 /* KMPreferenceManager.swift in Sources */,
 				89E93EFB299CB4C200F10F66 /* KMOCRBox.m in Sources */,
+				ADA9102F2A272CEA003352F0 /* KMImageOptimization.swift in Sources */,
 				BBAFC85C29851AF200D0648E /* KMTableRowView.m in Sources */,
 				AD9527DC2952EE700039D2BC /* KMPrintPage_C.swift in Sources */,
 				ADBC2D29299DCA76006280C8 /* NSTextField+Layer.swift in Sources */,
@@ -11550,7 +11552,6 @@
 				BBA93D2E29BEBAA60044E0DD /* KMPreferenceEnum.swift in Sources */,
 				F34BF94A295310AB002C25A2 /* NSUserDefaults+PDFListView.m in Sources */,
 				ADE8BC3F29F9458700570F89 /* KMRecommondInfo.m in Sources */,
-				AD3C6DFD2A1C488C0010B1A7 /* KMEditPDFTextManager.swift in Sources */,
 				89752DA02936EC50003FF08E /* KMToolbar.m in Sources */,
 				BB146FE5299DC0D100784A6A /* GTLRURITemplate.m in Sources */,
 				9F1FE4F129406E4700E952CA /* BackgroundGradientView.m in Sources */,
@@ -11634,7 +11635,6 @@
 				9F1FE49A29406E4700E952CA /* NewTabButton.m in Sources */,
 				BB146FEE299DC0D100784A6A /* GTLRBatchResult.m in Sources */,
 				ADCB98E22924776F00B51A03 /* KMBatchProcessingSizeTableCell.swift in Sources */,
-				AD58C0F92A1F2D3600F911A0 /* KMImageOptimization.swift in Sources */,
 				ADE8BC3C29F9458700570F89 /* KMRecommondManager.m in Sources */,
 				BB897272294DB6BE0045787C /* KMWatermarkAdjectivePlainView.swift in Sources */,
 				9F0CB49829683E1000007028 /* KMPropertiesPanelTextSubVC.swift in Sources */,
@@ -11905,7 +11905,6 @@
 				9F0CB523298656AA00007028 /* KMDesignToken+BorderRadiusBottomLeft.swift in Sources */,
 				9F0CB4DF2986554D00007028 /* KMDesignToken+HorizontalPadding.swift in Sources */,
 				AD44D654292C9E7900A94554 /* KMImageToPDFChooseView.swift in Sources */,
-				AD58C0FA2A1F2D3600F911A0 /* KMImageOptimization.swift in Sources */,
 				BBB9B318299A5D6D004F3235 /* KMDropboxManager.m in Sources */,
 				BB8F4559295AA1270037EA22 /* KMHeaderFooterPropertyInfoController.swift in Sources */,
 				89752DBA2936F9B9003FF08E /* NSButton+TitleColor.m in Sources */,
@@ -12169,6 +12168,7 @@
 				BB86C1FF28F54923005AD968 /* NSEvent_SKExtensions.m in Sources */,
 				BB49ED23293F527700C82CA2 /* KMConvertExcelSettingView.swift in Sources */,
 				9F0CB52B298656C900007028 /* KMDesignToken+BorderWidthTop.swift in Sources */,
+				ADA9102C2A272CE2003352F0 /* KMEditPDFTextManager.swift in Sources */,
 				BB146FD4299DC0D100784A6A /* GTLRDateTime.m in Sources */,
 				BB5F8A2129BB15AD00365ADB /* KMEmailSubWindowController.m in Sources */,
 				89E93EEF2999DB6600F10F66 /* KMNoteTypeCollectionViewItem.m in Sources */,
@@ -12273,7 +12273,6 @@
 				BB6DD81A29348A00001F0544 /* KMSecureEncryptComboBoxCellView.swift in Sources */,
 				BB147019299DC0D100784A6A /* OIDGrantTypes.m in Sources */,
 				BB146FC5299DC0D100784A6A /* GTMReadMonitorInputStream.m in Sources */,
-				AD3C6DFE2A1C488C0010B1A7 /* KMEditPDFTextManager.swift in Sources */,
 				9F1FE4FB29406E4700E952CA /* CTTabStripView.m in Sources */,
 				9FF94F1329A7476000B1EF69 /* KMDesignPropertySelector.swift in Sources */,
 				BBB9B315299A5D6D004F3235 /* DropboxModel.m in Sources */,
@@ -12417,6 +12416,7 @@
 				ADCB98E32924776F00B51A03 /* KMBatchProcessingSizeTableCell.swift in Sources */,
 				9F8539C829430AC400DF644E /* KMToolbarRightView.swift in Sources */,
 				89E4E72A2963FB74002DBA6F /* KMPropertiesViewPopController.m in Sources */,
+				ADA910302A272CEA003352F0 /* KMImageOptimization.swift in Sources */,
 				BB49ECEF293F3B0D00C82CA2 /* KMConvertOCRSettingItemView.swift in Sources */,
 				9F0CB4D72986551600007028 /* KMDesignToken+Spacing.swift in Sources */,
 				9F1FE49B29406E4700E952CA /* NewTabButton.m in Sources */,

PDF Office/PDF Master/Class/PDFWindowController/PDFListView/CPDFListViewExtension/CPDFListView+Event.m

@@ -41,6 +41,12 @@
 #import "CPDFListSignatureAnnotation.h"
 #import "NSGeometry_SKExtensions.h"
 
+#if VERSION_DMG
+#import <PDF_Master-Swift.h>
+#else
+#import <PDF_Master-Swift.h>
+#endif
+
 #define DEFAULT_MAGNIFICATION 2.5
 #define SMALL_MAGNIFICATION   1.5
 #define LARGE_MAGNIFICATION   4.0
@@ -2005,7 +2011,15 @@ static inline CPDFAreaOfInterest CAreaOfInterestForResizeHandle(CRectEdges mask,
         }
     } else if (CAnnotationTypeFreeText == self.annotationType ||
                CAnnotationTypeSignText == self.annotationType) {
-        CPDFAnnotationModel *annotationModel = [[CPDFAnnotationModel alloc]initWithAnnotationType:self.annotationType];
+        //保存参数
+        KMEditPDFTextFontModel *model = [KMEditPDFTextManager.manager fetchUserDefaultDataWithTypeStringWithType:@"Commonly"];
+        NSString *fontName = [KMEditPDFTextManager.manager fetchFontNameWithFontName:model.fontName];
+        NSString *fontStyle = [KMEditPDFTextManager.manager fetchFontStyleWithFontName:model.fontName];
+        CGFloat size = model.fontSize;
+        
+        CPDFAnnotationModel *annotationModel = [[CPDFAnnotationModel alloc] initWithAnnotationType:self.annotationType];
+        annotationModel.fontName = [NSString stringWithFormat:@"%@-%@",fontName,fontStyle];
+        annotationModel.fontSize = size;
         
         CGFloat defaultWidth = annotationModel.fontSize;
         CGFloat defaultHeight = annotationModel.fontSize;
@@ -2016,6 +2030,9 @@ static inline CPDFAreaOfInterest CAreaOfInterestForResizeHandle(CRectEdges mask,
 
         bounds = CPDFListViewConstrainRect(bounds, page.bounds,[CPDFListViewConfig defaultManager].annotationBorderOffset.floatValue);
         annotation = [self addAnnotationWithType:self.annotationType selection:nil page:page bounds:bounds];
+        if (self.annotationType == CAnnotationTypeFreeText) {
+            ((CPDFFreeTextAnnotation *)annotation).font = [NSFont fontWithName:fontName size:fontSize];
+        }
         originalBounds = [annotation bounds];
         if (annotation) {
             [self updateActiveAnnotations:@[annotation]];

PDF Office/PDF Master/Class/PDFWindowController/Side/RightSide/AnnotationProperty/KMGeneralAnnotationViewController.m

@@ -2089,6 +2089,7 @@
         [self updateFontSize:size.intValue needChangeListView:YES needSave:YES];
         
         [[NSNotificationCenter defaultCenter] postNotificationName:@"KMAnnotationFontTypeNotification" object:self.pdfView];
+        [self adjustFreetText];
     } else if (self.borderWidthVC == obj) {
         CGFloat lineWidth = [[self.borderWidthVC.stringValue stringByReplacingOccurrencesOfString:@"pt" withString:@""] floatValue];
         if (self.fillColorPickerVC.annotationType == KMPropertiesColor_SelfSignColors) {
@@ -2106,12 +2107,14 @@
         self.annotationModel.lineWidth = lineWidth;
         [self updateBorderWidthView];
         [self updateAnnotation];
+        [self adjustFreetText];
     } else if (obj == _textPresuppositionVC) {
         NSInteger index = self.textPresuppositionVC.indexOfSelectedItem;
         NSString *type = [KMEditPDFTextFontTypeWrapper allValues][index];
         [self updateTextPresupposition:type needChangeListView:true];
         [self updateAnnotation];
         [self adjustFreetText];
+        [[NSNotificationCenter defaultCenter] postNotificationName:@"KMAnnotationFontTypeNotification" object:self.pdfView];
     }
 }
 
@@ -2245,7 +2248,7 @@
     NSString *fontName = self.fontName;
     NSString *fontStyle = self.fontStyle;
     if (fontName != name || fontStyle != style) {
-        NSArray *styleArray = [KMEditPDFTextManager.manager fetchFontStyleWithFontNameWithFontName:fontName];
+        NSArray *styleArray = [KMEditPDFTextManager.manager fetchFontStyleWithFontNameWithFontName:name];
         NSString *styleString = [KMEditPDFTextManager.manager checkFontStyleWithStyle:style];
         if (![styleArray containsObject:style]) {
             [self.fontStyleVC addItemsWithObjectValues:styleArray];