mirrors/ghostty
1
0
Fork 0
mirror of https://github.com/ghostty-org/ghostty.git synced 2025-10-12 04:46:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

macos: "OK" should dismiss error

Browse Source
This commit is contained in:
Mitchell Hashimoto
2025-10-08 21:16:07 -07:00
parent 95a9e63401
commit 9e17255ca9
5 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
macos/Sources/App/macOS/AppDelegate.swift
View File

@@ -1008,7 +1008,7 @@ class AppDelegate: NSObject,
} }
@IBAction func checkForUpdates(_ sender: Any?) { @IBAction func checkForUpdates(_ sender: Any?) {
UpdateSimulator.notFound.simulate(with: updateViewModel) UpdateSimulator.error.simulate(with: updateViewModel)
} }

4
macos/Sources/Features/Update/UpdateDriver.swift
View File

@@ -38,7 +38,9 @@ class UpdateDriver: NSObject, SPUUserDriver {
} }
func showUpdaterError(_ error: any Error, acknowledgement: @escaping () -> Void) { func showUpdaterError(_ error: any Error, acknowledgement: @escaping () -> Void) {
viewModel.state = .error(.init(error: error, retry: retryHandler)) viewModel.state = .error(.init(error: error, retry: retryHandler, dismiss: { [weak viewModel] in
viewModel?.state = .idle
}))
} }
func showDownloadInitiated(cancellation: @escaping () -> Void) { func showDownloadInitiated(cancellation: @escaping () -> Void) {

1
macos/Sources/Features/Update/UpdatePopoverView.swift
View File

@@ -336,6 +336,7 @@ fileprivate struct UpdateErrorView: View {
HStack(spacing: 8) { HStack(spacing: 8) {
Button("OK") { Button("OK") {
error.dismiss()
dismiss() dismiss()
} }
.keyboardShortcut(.cancelAction) .keyboardShortcut(.cancelAction)

3
macos/Sources/Features/Update/UpdateSimulator.swift
View File

@@ -92,6 +92,9 @@ enum UpdateSimulator {
]), ]),
retry: { retry: {
simulateHappyPath(viewModel) simulateHappyPath(viewModel)
},
dismiss: {
viewModel.state = .idle
} }
)) ))
} }

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

@@ -172,6 +172,7 @@ enum UpdateState: Equatable {
struct Error { struct Error {
let error: any Swift.Error let error: any Swift.Error
let retry: () -> Void let retry: () -> Void
let dismiss: () -> Void
} }
struct Downloading { struct Downloading {