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