Skip to content

Fix #8: allow changing the default button with keyboard in confirm mode. #10

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
martinpaljak wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix #8: allow changing the default button with keyboard in confirm mode. #10

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 22 additions & 3 deletions ssh-askpass/ViewController.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,13 +48,32 @@ class ViewController: NSViewController {
// set first responder to allow closing window with escape key
switch self.sshAskpass.type {
case .confirmation, .information:
if let window = self.view.window {
window.makeFirstResponder(cancelButton)
}
self.view.window?.makeFirstResponder(cancelButton)
default: break // passwordTextField is first responder by default
}
}

// Handle tab key, even if navigation disabled in settings.
override func keyDown(with event: NSEvent) {
let switchers: [UInt16] = [48, 123, 124] // tab, left arrow, right arrow
guard switchers.contains(event.keyCode) else {
super.keyDown(with: event)
return
}

if (self.sshAskpass.type == .confirmation) {
if self.view.window?.firstResponder === cancelButton {
self.view.window?.makeFirstResponder(okButton)
cancelButton.keyEquivalent = ""
okButton.keyEquivalent = "\r"
} else {
self.view.window?.makeFirstResponder(cancelButton)
okButton.keyEquivalent = ""
cancelButton.keyEquivalent = "\r"
}
}
}

override func viewDidLoad() {
super.viewDidLoad()

Expand Down