【综合】内容编辑细节处理

PDF Office/PDF Master/Class/PDFWindowController/Side/RightSide/EditPDF/KMEditPDFTextPropertyViewController.swift

@@ -204,7 +204,7 @@ class KMEditPDFTextPropertyViewController: NSViewController {
         }
     }
     
-    var handdler: KMEditPDfHanddler?
+    weak var handdler: KMEditPDfHanddler?
     
     deinit {
         KMPrint("KMEditPDFTextPropertyViewController 已释放.")
@@ -558,16 +558,18 @@ class KMEditPDFTextPropertyViewController: NSViewController {
         if self.selectAreas.count == 1 {
             let areas = self.selectAreas.first
             if areas is CPDFEditTextArea  {
-                var sizeString = "\(abs(self.listView.editingSelectionFontSize(with: areas as? CPDFEditTextArea)))"
-                var fontName: String = self.listView.editingSelectionFontName(with: areas as? CPDFEditTextArea) ?? "Helvetica"
-                let alignment = self.listView.editingSelectionAlignment(with: areas as? CPDFEditTextArea)
-                let color = self.listView.editingSelectionFontColor(with: areas as? CPDFEditTextArea) ?? NSColor.black
-                fontName = KMEditPDFTextManager.manager.transformAreaTextFontName(fontName: fontName, fontNames: self.fontNameVC?.items ?? [])
-                if self.listView.isBoldCurrentSelection(with: areas as? CPDFEditTextArea) {
+                let area = areas as! CPDFEditTextArea
+                var sizeString = "\(abs(self.listView.editingSelectionFontSize(byRangeEdit: area)))"
+                var fontName: String = self.listView.editingSelectionCFont(byRangeEdit: area)?.familyName ?? "Helvetica"
+                let alignment = self.listView.currentSelectionAlignment(byRangeEdit: area)
+                let color = self.listView.editingSelectionFontColor(byRangeEdit: area) ?? NSColor.black
+//                fontName = KMEditPDFTextManager.manager.transformAreaTextFontName(fontName: fontName, fontNames: self.fontNameVC?.items ?? [])
+                
+                self.fontNameVC?.stringValue = fontName
+                if let data = self.listView?.isBoldCurrentSelection(byRangeEdit: area), data {
                     fontName += "-Bold"
                 }
-                
-                if self.listView.isItalicCurrentSelection(with: areas as? CPDFEditTextArea) {
+                if let data = self.listView?.isItalicCurrentSelection(byRangeEdit: area), data {
                     fontName += "-Italic"
                 }
                 //获取默认数据
@@ -854,9 +856,9 @@ extension KMEditPDFTextPropertyViewController {
     func updateTextTextPresuppositionState() {
         let areas = self.selectAreas.first
         if areas is CPDFEditTextArea  {
-            var size: CGFloat = (abs(self.listView.editingSelectionFontSize(with: areas as? CPDFEditTextArea)))
-            var fontName: String = self.listView.editingSelectionFontName(with: areas as? CPDFEditTextArea) ?? "Helvetica"
-            fontName = KMEditPDFTextManager.manager.transformAreaTextFontName(fontName: fontName, fontNames: self.fontNameVC?.items ?? [])
+            var size: CGFloat = (abs(self.listView.editingSelectionFontSize(byRangeEdit: areas as? CPDFEditTextArea)))
+            var fontName = self.listView.editingSelectionCFont(byRangeEdit: areas as? CPDFEditTextArea)?.familyName ?? "Helvetica"
+//            fontName = KMEditPDFTextManager.manager.transformAreaTextFontName(fontName: fontName, fontNames: self.fontNameVC?.items ?? [])
             
             if self.listView.isBoldCurrentSelection(with: areas as? CPDFEditTextArea) {
                 fontName += "-Bold"