diff options
| author |   Roopesh Chander <roop@roopc.net> | 2019-05-06 11:12:47 +0530 |
|---|---|---|
| committer | Roopesh Chander <roop@roopc.net> | 2019-05-20 16:42:27 +0530 |
| commit | 6d8965e97dd2a44c717ca06d0750700f299a0bc2 (patch) | |
| tree | 01eb8e7941bc01437db2399990c29a8e3396033e /WireGuard | |
| parent | macOS: Show app in dock when showing the manage tunnels window (diff) | |
| download | wireguard-apple-6d8965e97dd2a44c717ca06d0750700f299a0bc2.tar.xz wireguard-apple-6d8965e97dd2a44c717ca06d0750700f299a0bc2.zip | |
macOS: Remove custom key event handling
Signed-off-by: Roopesh Chander <roop@roopc.net>
Diffstat (limited to 'WireGuard')
| -rw-r--r-- | WireGuard/WireGuard/UI/macOS/Application.swift | 29 | ||||
| -rw-r--r-- | WireGuard/WireGuard/UI/macOS/ViewController/ManageTunnelsRootViewController.swift | 24 |
2 files changed, 0 insertions, 53 deletions
diff --git a/WireGuard/WireGuard/UI/macOS/Application.swift b/WireGuard/WireGuard/UI/macOS/Application.swift index 6e33802..0ce274a 100644 --- a/WireGuard/WireGuard/UI/macOS/Application.swift +++ b/WireGuard/WireGuard/UI/macOS/Application.swift @@ -5,18 +5,6 @@ import Cocoa class Application: NSApplication { - private let characterKeyCommands = [ - "x": #selector(NSText.cut(_:)), - "c": #selector(NSText.copy(_:)), - "v": #selector(NSText.paste(_:)), - "z": #selector(UndoActionRespondable.undo(_:)), - "a": #selector(NSResponder.selectAll(_:)), - "Z": #selector(UndoActionRespondable.redo(_:)), - "w": #selector(NSWindow.performClose(_:)), - "m": #selector(NSWindow.performMiniaturize(_:)), - "q": #selector(AppDelegate.quit) - ] - private var appDelegate: AppDelegate? //swiftlint:disable:this weak_delegate override init() { @@ -28,21 +16,4 @@ class Application: NSApplication { required init?(coder: NSCoder) { fatalError("init(coder:) has not been implemented") } - - override func sendEvent(_ event: NSEvent) { - let modifierFlags = event.modifierFlags.rawValue & NSEvent.ModifierFlags.deviceIndependentFlagsMask.rawValue - - if event.type == .keyDown, - (modifierFlags == NSEvent.ModifierFlags.command.rawValue || modifierFlags == NSEvent.ModifierFlags.command.rawValue | NSEvent.ModifierFlags.shift.rawValue), - let selector = characterKeyCommands[event.charactersIgnoringModifiers ?? ""] { - sendAction(selector, to: nil, from: self) - } else { - super.sendEvent(event) - } - } -} - -@objc protocol UndoActionRespondable { - func undo(_ sender: AnyObject) - func redo(_ sender: AnyObject) } diff --git a/WireGuard/WireGuard/UI/macOS/ViewController/ManageTunnelsRootViewController.swift b/WireGuard/WireGuard/UI/macOS/ViewController/ManageTunnelsRootViewController.swift index b388843..aa6a76d 100644 --- a/WireGuard/WireGuard/UI/macOS/ViewController/ManageTunnelsRootViewController.swift +++ b/WireGuard/WireGuard/UI/macOS/ViewController/ManageTunnelsRootViewController.swift @@ -115,27 +115,3 @@ extension ManageTunnelsRootViewController: TunnelsListTableViewControllerDelegat self.tunnelDetailVC = nil } } - -extension ManageTunnelsRootViewController { - override func keyDown(with event: NSEvent) { - let modifierFlags = event.modifierFlags.rawValue & NSEvent.ModifierFlags.deviceIndependentFlagsMask.rawValue - let isCmdOrCmdShiftDown = (modifierFlags == NSEvent.ModifierFlags.command.rawValue || modifierFlags == NSEvent.ModifierFlags.command.rawValue | NSEvent.ModifierFlags.shift.rawValue) - - if event.specialKey == .delete { - tunnelsListVC?.handleRemoveTunnelAction() - } else if isCmdOrCmdShiftDown { - switch event.charactersIgnoringModifiers { - case "n": - tunnelsListVC?.handleAddEmptyTunnelAction() - case "o": - tunnelsListVC?.handleImportTunnelAction() - case "t": - tunnelDetailVC?.handleToggleActiveStatusAction() - case "e": - tunnelDetailVC?.handleEditTunnelAction() - default: - break - } - } - } -} |