Browse Source

【fix】【注释】手绘属性面板,虚线样式未兼容夜间模式

tangchao 7 months ago
parent
commit
3ccec6df41

+ 1 - 0
PDF Office/PDF Master/Class/PDFWindowController/Side/RightSide/AnnotationProperty/KMGeneralAnnotationViewController.swift

@@ -836,6 +836,7 @@ let KMColorPickerViewHeight: CGFloat = 64
     }
 
     func setViewColor(_ view: NSView, _ backgroundColor: CGColor, _ borderColor: CGColor) {
+        view.wantsLayer = true
         view.layer?.backgroundColor = backgroundColor
         view.layer?.borderColor = borderColor
     }

+ 7 - 5
PDF Office/PDF Master/Class/PDFWindowController/Side/RightSide/Freehand/Controller/KMFreehandAnnotationController.swift

@@ -96,18 +96,20 @@ import Cocoa
         super.updateViewColor()
         
         if KMAppearance.isDarkMode() {
-            let darkColor = NSColor(red: 57/255.0, green: 60/255.0, blue: 62/255.0, alpha: 1.0).cgColor
-            let borderColor = NSColor(red: 86/255.0, green: 88/255.0, blue: 90/255.0, alpha: 1.0).cgColor
+            let darkColor = NSColor(red: 57/255.0, green: 60/255.0, blue: 62/255.0, alpha: 1.0)
+            let borderColor = NSColor(red: 86/255.0, green: 88/255.0, blue: 90/255.0, alpha: 1.0)
             
             if let data = self.lineAndBorderItemView?.dashComboBox {
-                setViewColor(data, darkColor, borderColor)
+                setViewColor(data, darkColor.cgColor, borderColor.cgColor)
+                data.backgroundColor = darkColor
             }
         } else {
-            let lightColor = NSColor.white.cgColor
+            let lightColor = NSColor.white
             let borderColor = NSColor(red: 218/255.0, green: 219/255.0, blue: 222/255.0, alpha: 1.0).cgColor
             
             if let data = self.lineAndBorderItemView?.dashComboBox {
-                setViewColor(data, lightColor, borderColor)
+                setViewColor(data, lightColor.cgColor, borderColor)
+                data.backgroundColor = lightColor
             }
         }
     }