mirrors/ghostty
1
0
Fork 0
mirror of https://github.com/ghostty-org/ghostty.git synced 2026-08-05 15:18:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

macOS: show cancel update option when its actually cancellable

Browse Source 
`extracting` and `installing` state aren't cancellable by us
This commit is contained in:
Lukas
2026-07-30 10:21:27 +02:00
parent b8ab2ff168
commit 63d08c0342
2 changed files with 49 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

52
macos/Sources/Features/Command Palette/TerminalCommandPalette.swift
View File

@@ -84,35 +84,39 @@ struct TerminalCommandPaletteView: View {
private var updateOptions: [CommandOption] {
var options: [CommandOption] = []
guard let updateViewModel, updateViewModel.state.isInstallable else {
guard let updateViewModel else {
return options
}
// We override the update available one only because we want to properly
// convey it'll go all the way through.
let title: String
if case .updateAvailable = updateViewModel.state {
title = "Update Ghostty and Restart"
} else {
title = updateViewModel.text
if updateViewModel.state.isInstallable {
// We override the update available one only because we want to properly
// convey it'll go all the way through.
let title: String
if case .updateAvailable = updateViewModel.state {
title = "Update Ghostty and Restart"
} else {
title = updateViewModel.text
}
options.append(CommandOption(
title: title,
description: updateViewModel.description,
leadingIcon: updateViewModel.iconName ?? "shippingbox.fill",
badge: updateViewModel.badge,
emphasis: true
) {
(NSApp.delegate as? AppDelegate)?.updateController.viewModel.state.confirm()
})
}
options.append(CommandOption(
title: title,
description: updateViewModel.description,
leadingIcon: updateViewModel.iconName ?? "shippingbox.fill",
badge: updateViewModel.badge,
emphasis: true
) {
(NSApp.delegate as? AppDelegate)?.updateController.viewModel.state.confirm()
})
options.append(CommandOption(
title: "Cancel or Skip Update",
description: "Dismiss the current update process"
) {
updateViewModel.state.cancel()
})
if updateViewModel.state.isCancellable {
options.append(CommandOption(
title: "Cancel or Skip Update",
description: "Dismiss the current update process"
) {
updateViewModel.state.cancel()
})
}
return options
}

28
macos/Sources/Features/Update/UpdateViewModel.swift
View File

@@ -205,20 +205,34 @@ enum UpdateState: Equatable {
}
}
var isCancellable: Bool {
cancelAction != nil
}
func cancel() {
cancelAction?()
}
private var cancelAction: (() -> Void)? {
switch self {
case .idle:
nil
case .permissionRequest:
nil
case .checking(let checking):
checking.cancel()
checking.cancel
case .updateAvailable(let available):
available.reply(.dismiss)
{ available.reply(.dismiss) }
case .downloading(let downloading):
downloading.cancel()
downloading.cancel
case .notFound(let notFound):
notFound.acknowledgement()
notFound.acknowledgement
case .error(let err):
err.dismiss()
default:
break
err.dismiss
case .extracting:
nil
case .installing:
nil
}
}