【综合】内容编辑适配暗黑

PDF Office/PDF Master/Class/Common/Designs/KMDesignTextField.swift

@@ -8,6 +8,11 @@
 // 输入框 组件
 class KMDesignTextField: KMDesignBaseView {
     private var textField: KMCustomTextField?
+    var textF: KMCustomTextField? {
+        get {
+            return self.textField
+        }
+    }
     
     private var _designSize: KMDesignSize = .medium
     var designSize: KMDesignSize {
@@ -63,6 +68,8 @@ class KMDesignTextField: KMDesignBaseView {
         }
     }
     
+    var useToken = true
+    
     convenience init(designSize: KMDesignSize = .medium) {
         self.init()
         
@@ -133,11 +140,33 @@ class KMDesignTextField: KMDesignBaseView {
     }
     
     override func updateUI(state: KMDesignTokenState) {
-        super.updateUI(state: state)
+        if self.useToken {
+            super.updateUI(state: state)
+        }
         
         self.textField?.backgroundView.layer?.backgroundColor = self.fillColor.cgColor
         self.textField?.backgroundView.layer?.borderWidth = self.borderWidth
-        self.textField?.backgroundView.layer?.borderColor = self.borderColor.cgColor
+        if self.useToken {
+            self.textField?.backgroundView.layer?.borderColor = self.borderColor.cgColor
+        } else {
+            if state == .Hov {
+                let borderColor = NSColor(hex: "68ACF8")
+                self.textField?.backgroundView.layer?.borderColor = borderColor.cgColor
+            } else if state == .Focus {
+                let borderColor = NSColor(hex: "68ACF8")
+                self.textField?.backgroundView.layer?.borderColor = borderColor.cgColor
+            } else {
+                if KMAppearance.isDarkMode() {
+//                    let borderColor = KMAppearance.Interactive.s0Color()
+                    let borderColor = NSColor(hex: "56585A")
+                    self.textField?.backgroundView.layer?.borderColor = borderColor.cgColor
+                } else {
+                    let borderColor = NSColor(hex: "DFE1E5")
+                    self.textField?.backgroundView.layer?.borderColor = borderColor.cgColor
+                }
+            }
+        }
+        
         self.textField?.backgroundView.layer?.cornerRadius = self.borderRadius
     }
 }

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

@@ -204,6 +204,7 @@ class KMEditImagePropertyViewController: NSViewController {
         self.rotateTitleLabel.stringValue = NSLocalizedString("Rotate", comment: "")
         self.rotateTextFieldItemView.delegate = self
         self.rotateTextFieldItemView.enterKeyEndEdit = true
+        self.rotateTextFieldItemView.useToken = false
         
         self.leftRotateVC = KMDesignButton(withType: .Image)
         self.leftRotateBox.contentView = self.leftRotateVC?.view
@@ -438,6 +439,17 @@ class KMEditImagePropertyViewController: NSViewController {
             self.hTextFieldItemView.backgroundView.layer?.backgroundColor = KMAppearance.Layout.w15Color().cgColor
             self.hTextFieldItemView.backgroundView.layer?.borderColor = KMAppearance.Layout.w15Color().cgColor
             
+            self.rotateTextFieldItemView.fillColor = KMAppearance.Layout.w15Color()
+            self.rotateTextFieldItemView.textF?.backgroundView.layer?.backgroundColor = KMAppearance.Layout.w15Color().cgColor
+//            self.rotateTextFieldItemView.updateUI(state: self.rotateTextFieldItemView.state)
+            
+            if self.rotateTextFieldItemView.state == .Focus {
+                let borderColor = NSColor(hex: "68ACF8")
+                self.rotateTextFieldItemView.textF?.backgroundView.layer?.borderColor = borderColor.cgColor
+            } else {
+                let borderColor = NSColor(hex: "56585A")
+                self.rotateTextFieldItemView.textF?.backgroundView.layer?.borderColor = borderColor.cgColor
+            }
         } else {
             self.backgroundView.backgroundColor(NSColor.km_init(hex: "#FAFAFA"))
             self.noBackgroundView.backgroundColor(NSColor.km_init(hex: "#F7F8FA"))
@@ -482,9 +494,22 @@ class KMEditImagePropertyViewController: NSViewController {
             self.hTextFieldItemView.backgroundView.layer?.backgroundColor = .white
             self.hTextFieldItemView.backgroundView.layer?.borderColor = NSColor(hex: "#DFE1E5").cgColor
             
+<<<<<<< HEAD
             self.rightRotateVC?.initDefaultValue()
             
             self.leftRotateVC?.initDefaultValue()
+=======
+            self.rotateTextFieldItemView.fillColor = .white
+//            self.rotateTextFieldItemView.updateUI(state: self.rotateTextFieldItemView.state)
+            self.rotateTextFieldItemView.textF?.backgroundView.layer?.backgroundColor = .white
+            if self.rotateTextFieldItemView.state == .Focus {
+                let borderColor = NSColor(hex: "68ACF8")
+                self.rotateTextFieldItemView.textF?.backgroundView.layer?.borderColor = borderColor.cgColor
+            } else {
+                let borderColor = NSColor(hex: "DFE1E5")
+                self.rotateTextFieldItemView.textF?.backgroundView.layer?.borderColor = borderColor.cgColor
+            }
+>>>>>>> 54ea082a1 (【综合】内容编辑适配暗黑)
         }
         
         for label in [self.whTitleLabel, self.opacityTitleLabel,

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

@@ -1287,6 +1287,8 @@ extension KMEditPDFTextPropertyViewController {
 }
 
 //MARK: - Private
+// 更新字体名称+字重
+
 extension KMEditPDFTextPropertyViewController {
     func updateFontNameAndStyle(name: String, style: String, needChangeListView: Bool = true, needSave: Bool = true) {
         //        if fontName != name || fontStyle != style {