marketing-shibata50/cmux
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix(cmux): focus close confirmation actions

Browse source
This commit is contained in:
austinpower1258 2026-03-13 12:53:20 -07:00
parent 9bfa3b9143
commit 7f40e0097b
2 changed files with 15 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

16
Sources/TabManager.swift
View file

@ -1587,6 +1587,7 @@ class TabManager: ObservableObject {
if let confirmCloseHandler {
return confirmCloseHandler(title, message, acceptCmdD)
}
_ = acceptCmdD
let alert = NSAlert()
alert.messageText = title
@ -1596,16 +1597,17 @@ class TabManager: ObservableObject {
alert.addButton(withTitle: String(localized: "common.cancel", defaultValue: "Cancel"))
if let closeButton = alert.buttons.first {
// Keep Return/Enter bound to the primary destructive action for all close prompts.
closeButton.keyEquivalent = "\r"
closeButton.keyEquivalentModifierMask = []
alert.window.defaultButtonCell = closeButton.cell as? NSButtonCell
alert.window.initialFirstResponder = closeButton
}
if let cancelButton = alert.buttons.dropFirst().first {
cancelButton.keyEquivalent = "\u{1b}"
}
// macOS convention: Cmd+D = confirm destructive close (e.g. "Don't Save").
// We only opt into this for the "close last workspace => close window" path to avoid
// conflicting with app-level Cmd+D (split right) during normal usage.
if acceptCmdD, let closeButton = alert.buttons.first {
closeButton.keyEquivalent = "d"
closeButton.keyEquivalentModifierMask = [.command]
if NSApp.activationPolicy() == .regular {
NSApp.activate(ignoringOtherApps: true)
}
return alert.runModal() == .alertFirstButtonReturn

6
Sources/Workspace.swift
View file

@ -4148,7 +4148,13 @@ extension Workspace: BonsplitDelegate {
alert.addButton(withTitle: String(localized: "common.cancel", defaultValue: "Cancel"))
if let closeButton = alert.buttons.first {
closeButton.keyEquivalent = "\r"
closeButton.keyEquivalentModifierMask = []
alert.window.defaultButtonCell = closeButton.cell as? NSButtonCell
alert.window.initialFirstResponder = closeButton
}
if let cancelButton = alert.buttons.dropFirst().first {
cancelButton.keyEquivalent = "\u{1b}"
}
// Prefer a sheet if we can find a window, otherwise fall back to modal.