【综合】文本编辑模块暗黑模式兼容

PDF Office/PDF Master/Class/PDFTools/EditPDF/Controller/KMEditPDFPopToolBarController.swift

@@ -260,8 +260,12 @@ class KMEditPDFPopToolBarController: NSViewController {
         self.view.wantsLayer = true
         if appearance == .darkAqua {
             self.view.layer?.backgroundColor = NSColor(red: 37/255.0, green: 37/255.0, blue: 38/255.0, alpha: 1.0).cgColor
+            
+            
         } else {
             self.view.layer?.backgroundColor = .white
+            
+            
         }
         
         Task { @MainActor in
@@ -381,9 +385,6 @@ extension KMEditPDFPopToolBarController: KMEditPDFToolbarViewDelegate {
             viewC.showVerticalScroller = true
             fontStyleView.view = viewC.view
             fontStyleView.obj = viewC
-//            if KMAppearance.isDarkMode() {
-//                viewC.background = NSColor(white: 0, alpha: 0.15)
-//            }
             viewC.borderColor = KMAppearance.Interactive.s0Color()
             viewC.background = KMAppearance.Layout.l1Color()
             viewC.background_hov = KMAppearance.Layout.l1Color()
@@ -422,9 +423,10 @@ extension KMEditPDFPopToolBarController: KMEditPDFToolbarViewDelegate {
             colorView.obj = viewC
             viewC.pagination()
             if KMAppearance.isDarkMode() {
-                viewC.background_hov = NSColor(hex: "#365898")
+                viewC.background_hov = NSColor(red: 71/255, green: 72/255, blue: 75/255, alpha: 1)
+                viewC.background_sel = KMAppearance.Interactive.m1Color()
             } else {
-    //            viewC.background_hov = NSColor(hex: "#EDEEF0")
+                viewC.background_hov = NSColor(hex: "#EDEEF0")
             }
             
             viewC.tag = index
@@ -445,9 +447,10 @@ extension KMEditPDFPopToolBarController: KMEditPDFToolbarViewDelegate {
             itemView.obj = viewC
             viewC.pagination()
             if KMAppearance.isDarkMode() {
-                viewC.background_hov = NSColor(hex: "#365898")
+                viewC.background_hov = NSColor(red: 71/255, green: 72/255, blue: 75/255, alpha: 1)
+                viewC.background_sel = KMAppearance.Interactive.m1Color()
             } else {
-    //            viewC.background_hov = NSColor(hex: "#EDEEF0")
+                viewC.background_hov = NSColor(hex: "#EDEEF0")
             }
             
             viewC.tag = index
@@ -520,9 +523,10 @@ extension KMEditPDFPopToolBarController: KMEditPDFToolbarViewDelegate {
         colorView.obj = viewC
         viewC.pagination()
         if KMAppearance.isDarkMode() {
-            viewC.background_hov = NSColor(hex: "#365898")
+            viewC.background_hov = NSColor(red: 71/255, green: 72/255, blue: 75/255, alpha: 1)
+            
         } else {
-//            viewC.background_hov = NSColor(hex: "#EDEEF0")
+//            viewC.background_hov = NSColor(hex: "#365898")
         }
         
         viewC.tag = index
@@ -553,6 +557,13 @@ extension KMEditPDFPopToolBarController: KMEditPDFToolbarViewDelegate {
             DispatchQueue.main.async {
                 viewC.state = model.isSelected ? .Act : .Norm
             }
+            if KMAppearance.isDarkMode() {
+                viewC.background = NSColor.clear
+                viewC.background_hov = NSColor(red: 71/255, green: 72/255, blue: 75/255, alpha: 1)
+                viewC.background_act = KMAppearance.Interactive.m1Color()
+            } else {
+                
+            }
         } else if itemKey == .fontItalic {
             viewC.image = NSImage(named: "KMImageNameEditPDFFontItalic")!
             colorView.popToolTip = NSLocalizedString("Italic font", comment: "")
@@ -564,6 +575,13 @@ extension KMEditPDFPopToolBarController: KMEditPDFToolbarViewDelegate {
             DispatchQueue.main.async {
                 viewC.state = model.isSelected ? .Act : .Norm
             }
+            if KMAppearance.isDarkMode() {
+                viewC.background = NSColor.clear
+                viewC.background_hov = NSColor(red: 71/255, green: 72/255, blue: 75/255, alpha: 1)
+                viewC.background_act = KMAppearance.Interactive.m1Color()
+            } else {
+                
+            }
         } else if itemKey == .textAlignment {
             viewC.image = NSImage(named: "KMImageNameEditPDFAlignCenterSelect")!
             colorView.popToolTip = NSLocalizedString("Center text", comment: "")

PDF Office/PDF Master/Class/PDFTools/EditPDF/Controller/KMTextAlignmentController.swift

@@ -22,7 +22,6 @@ class KMTextAlignmentController: NSViewController {
         super.viewDidLoad()
         
         self.view.wantsLayer = true
-        self.view.layer?.backgroundColor = .white
         
         self.leftVc_ = KMDesignButton(withType: .Image)
         self.leftBox.contentView = self.leftVc_!.view
@@ -50,9 +49,31 @@ class KMTextAlignmentController: NSViewController {
         self.rightVc_?.action = #selector(_itemClick)
         self.rightVc_?.image = NSImage(named: "KMImageNameEditPDFAlignRightSelect")!
         self.rightVc_?.tag = 2
+        
+        self.reloadData()
     }
     
     @objc private func _itemClick(_ sender: NSButton) {
         self.itemAction?(sender.tag)
     }
+    
+    func reloadData() {
+        
+        if KMAppearance.isDarkMode() {
+            self.view.layer?.backgroundColor = KMAppearance.Layout.l0Color().cgColor
+            self.leftVc_?.background_hov = NSColor(red: 71/255, green: 72/255, blue: 75/255, alpha: 1)
+            self.centerVc_?.background_hov = NSColor(red: 71/255, green: 72/255, blue: 75/255, alpha: 1)
+            self.rightVc_?.background_hov = NSColor(red: 71/255, green: 72/255, blue: 75/255, alpha: 1)
+            
+            
+        } else {
+            self.view.layer?.backgroundColor = .white
+            self.leftVc_?.background_hov = NSColor(red: 237/255, green: 238/255, blue: 240/255, alpha: 1)
+            self.centerVc_?.background_hov = NSColor(red: 237/255, green: 238/255, blue: 240/255, alpha: 1)
+            self.rightVc_?.background_hov = NSColor(red: 237/255, green: 238/255, blue: 240/255, alpha: 1)
+            
+            
+        }
+        
+    }
 }

PDF Office/PDF Master/Class/PDFTools/EditPDF/Window/KMEditPDFPopToolBarWindow.swift

@@ -50,6 +50,7 @@ import Cocoa
         let contentViewC = (self.contentViewController as? KMEditPDFPopToolBarController)
         contentViewC?.fontColor = self.model.fontColors.last ?? .black
         contentViewC?.areaCount = self.model.editingAreas?.count ?? 0
+        contentViewC?.toolbarView?.reloadData()
         
         var width: CGFloat = 392
         if self.style.contains(.text) {