Explorar el Código

【fix】【偏好设置】批注设置,选中时,夜间模式显示不兼容

tangchao hace 10 meses
padre
commit
953735d364

+ 2 - 3
PDF Office/PDF Master/Class/Common/Category/NSObject+KMExtension.swift

@@ -320,12 +320,11 @@ func KMShiftAndResizeView(_ view: NSView, dx: CGFloat, dw: CGFloat) {
     view.frame = frame
 }
 
-func KMDrawTextFieldBezel(_ rect: NSRect, _ controlView: NSView) {
+func KMDrawTextFieldBezel(_ rect: NSRect, _ controlView: NSView, _ fillColor: NSColor = .controlColor) {
     let cell = NSTextFieldCell(textCell: "")
     cell.isBezeled = true
     
-    NSColor.controlColor.setFill()
-//    NSRectFill(rect);
+    fillColor.setFill()
     rect.fill()
     cell.draw(withFrame: rect, in: controlView)
     cell.controlView = nil

+ 5 - 7
PDF Office/PDF Master/Class/Preference/View/KMLineWell.swift

@@ -245,7 +245,11 @@ class KMLineWell: NSControl {
 
         let bounds = self.bounds
         
-        KMDrawTextFieldBezel(bounds, self)
+        if KMAppearance.isDarkMode() {
+            KMDrawTextFieldBezel(bounds, self, .white)
+        } else {
+            KMDrawTextFieldBezel(bounds, self)
+        }
         
         if (self.isActive) {
             NSGraphicsContext.saveGraphicsState()
@@ -291,19 +295,14 @@ class KMLineWell: NSControl {
             var keepOn = true
             var _event: NSEvent = event
             while (keepOn) {
-//                theEvent = [[self window] nextEventMatchingMask: NSLeftMouseUpMask | NSLeftMouseDraggedMask];
                 if let data = self.window?.nextEvent(matching: [.leftMouseUp, .leftMouseDragged]) {
                     _event = data
                     switch (_event.type) {
                     case .leftMouseDragged:
-//                        {
-//                            NSMutableDictionary *dict = [NSMutableDictionary dictionaryWithObjectsAndKeys:
-//                                                            [NSNumber numberWithDouble:lineWidth], , [NSNumber numberWithInteger:style], , dashPattern, , nil];
                             var dict = [SKLineWellLineWidthKey : NSNumber(value: self.lineWidth),
                                         SKLineWellStyleKey : NSNumber(value: self.style.rawValue),
                                         SKLineWellDashPatternKey : self.dashPattern ?? []]
                         if self.displayStyle == .line {
-//                            if ([self displayStyle] == SKLineWellDisplayStyleLine) {
                             dict[SKLineWellStartLineStyleKey] = NSNumber(value: self.startLineStyle.rawValue)
                             dict[SKLineWellEndLineStyleKey] = NSNumber(value: self.endLineStyle.rawValue)
                         }
@@ -322,7 +321,6 @@ class KMLineWell: NSControl {
                         if (self.isActive) {
                             self._deactivate()
                         } else {
-//                            [self activate:(modifiers & NSShiftKeyMask) == 0];
                             self._activate(modifiers.contains(.shift) == false)
                         }
                         keepOn = false