Some more cleanup.

This commit is contained in:
2025-01-15 16:12:15 -08:00
parent 2fd0399b8f
commit 6557993214
2 changed files with 11 additions and 10 deletions

View File

@@ -9,41 +9,42 @@ final class EditableNSTextField: NSTextField {
weak var auxiliaryDelegate: EditableNSTextFieldDelegate? weak var auxiliaryDelegate: EditableNSTextFieldDelegate?
override func performKeyEquivalent(with event: NSEvent) -> Bool { override func performKeyEquivalent(with event: NSEvent) -> Bool {
if event.type == NSEvent.EventType.keyDown { let modifiers = event.modifierFlags.rawValue
let modifiers = event.modifierFlags.rawValue let key = event.keyCode
let key = event.keyCode
if event.type == NSEvent.EventType.keyDown {
if modsContains(keys: OSCmd, in: modifiers) { if modsContains(keys: OSCmd, in: modifiers) {
if key == kVK_ANSI_X { if key == kVK_ANSI_X {
if NSApp.sendAction(#selector(NSText.cut(_:)), if NSApp.sendAction(#selector(NSText.cut(_:)),
to: nil, from: self) to: nil, from: self)
{ return true } { return true }
} else if key == kVK_ANSI_C { } else if key == kVK_ANSI_C {
if NSApp.sendAction(#selector(NSText.copy(_:)), if NSApp.sendAction(#selector(NSText.copy(_:)),
to: nil, from: self) to: nil, from: self)
{ return true } { return true }
} else if key == kVK_ANSI_V { } else if key == kVK_ANSI_V {
if NSApp.sendAction(#selector(NSText.paste(_:)), if NSApp.sendAction(#selector(NSText.paste(_:)),
to: nil, from: self) to: nil, from: self)
{ return true } { return true }
} else if key == kVK_ANSI_Z { } else if key == kVK_ANSI_Z {
if NSApp.sendAction(Selector(("undo:")), if NSApp.sendAction(Selector(("undo:")),
to: nil, from: self) to: nil, from: self)
{ return true } { return true }
} else if key == kVK_ANSI_A { } else if key == kVK_ANSI_A {
if NSApp.sendAction( if NSApp.sendAction(
#selector(NSResponder.selectAll(_:)), to: nil, #selector(NSResponder.selectAll(_:)), to: nil,
from: self) from: self)
{ return true } { return true }
} }
} else if modsContains(keys: OSCmd | OSShift, in: modifiers) { } else if modsContains(keys: OSCmd | OSShift, in: modifiers) {
if key == kVK_ANSI_Z { if key == kVK_ANSI_Z {
if NSApp.sendAction(Selector(("redo:")), to: nil, if NSApp.sendAction(Selector(("redo:")), to: nil,
from: self) from: self)
{ return true } { return true }
} }
} }
} }
return super.performKeyEquivalent(with: event) return super.performKeyEquivalent(with: event)
} }

View File

@@ -28,7 +28,7 @@ class PathsTableCellView: NSTableCellView, NSTextFieldDelegate,
var selectionButton: NSButton = { var selectionButton: NSButton = {
let button = NSButton() let button = NSButton()
button.image = systemImage("hand.point.up.fill", .headline, .large, button.image = systemImage("hand.point.up.fill", .headline, .large,
.init(paletteColors: [.white, .systemRed])) .init(paletteColors: [.labelColor, .systemRed]))
button.isBordered = false button.isBordered = false
button.sizeToFit() button.sizeToFit()
button.toolTip = "Select Path" button.toolTip = "Select Path"