|
@@ -1158,13 +1158,16 @@ extension KMEditPDFTextPropertyViewController {
|
|
|
var fontName = cfont?.familyName ?? "Helvetica"
|
|
|
// fontName = KMEditPDFTextManager.manager.transformAreaTextFontName(fontName: fontName, fontNames: self.fontNameVC?.items ?? [])
|
|
|
|
|
|
-// if let data = self.listView?.isBoldCurrentSelection(byRangeEdit: areas as? CPDFEditTextArea), data {
|
|
|
+ var isBold = false
|
|
|
+ if let data = self.listView?.isBoldCurrentSelection(byRangeEdit: areas as? CPDFEditTextArea) {
|
|
|
// fontName += "-Bold"
|
|
|
-// }
|
|
|
-//
|
|
|
-// if let data = self.listView?.isItalicCurrentSelection(byRangeEdit: areas as? CPDFEditTextArea), data {
|
|
|
+ isBold = data
|
|
|
+ }
|
|
|
+ var isItalic = false
|
|
|
+ if let data = self.listView?.isItalicCurrentSelection(byRangeEdit: areas as? CPDFEditTextArea) {
|
|
|
// fontName += "-Italic"
|
|
|
-// }
|
|
|
+ isItalic = data
|
|
|
+ }
|
|
|
// var fontN = fontName
|
|
|
// if let data = cfont {
|
|
|
// fontN = CPDFFont.convertAppleFont(data) ?? fontName
|
|
@@ -1174,7 +1177,7 @@ extension KMEditPDFTextPropertyViewController {
|
|
|
var index = 0
|
|
|
for i in 0...models.count - 1 {
|
|
|
let model = models[i]
|
|
|
- if model.fontName == fontName && size == model.fontSize {
|
|
|
+ if model.fontName == fontName && model.fontStyle == cfont?.styleName && size == model.fontSize && model.bold == isBold && model.italic == isItalic {
|
|
|
index = i
|
|
|
}
|
|
|
}
|