ai/byre
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 6 Wiki Activity

merge modal location

Browse Source
This commit is contained in:
Ian Gulliver
2026-10-17 08:51:59 -07:00
parent 38643e65f5
commit 3e537c827d
5 changed files with 35 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mac/Sources/Byre/MergeDialog.swift
+2 -3
View File
@@ -137,9 +137,8 @@ func confirmMerge(_ taskId: String, _ store: Store, _ overlays: Overlays) async
overlays.showAlert(errorText(error))
}
}
let anchor = overlays.mergeFrame
if !model.running {
if await overlays.showModal(content, [ModalButton(label: "Cancel", value: "cancel"), ModalButton(label: "Merge", value: "ok", primary: true)], anchor: anchor, canSubmit: { model.valid }) == "ok" {
if await overlays.showModal(content, [ModalButton(label: "Cancel", value: "cancel"), ModalButton(label: "Merge", value: "ok", primary: true)], inPane: true, canSubmit: { model.valid }) == "ok" {
await merge(false)
}
return
@@ -148,7 +147,7 @@ func confirmMerge(_ taskId: String, _ store: Store, _ overlays: Overlays) async
ModalButton(label: "Cancel", value: "cancel"),
ModalButton(label: "Merge now", value: "now"),
ModalButton(label: "After review", value: "after", primary: true, help: "Merge once the running review finishes with no findings"),
], anchor: anchor, canSubmit: { model.valid })
], inPane: true, canSubmit: { model.valid })
if choice == "now" || choice == "after" {
await merge(choice == "after")
}