mirrors/ghostty
1
0
Fork 0
mirror of https://github.com/ghostty-org/ghostty.git synced 2025-09-23 03:28:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

macos: close surface works

Browse Source
This commit is contained in:
Mitchell Hashimoto
2023-03-10 14:44:33 -08:00
parent a265e7ce20
commit 0aadd19282
3 changed files with 28 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
macos/Sources/Ghostty/Ghostty.SplitView.swift
View File

@@ -7,10 +7,11 @@ extension Ghostty {
/// split direction by splitting the terminal.
struct TerminalSplit: View {
@Environment(\.ghosttyApp) private var app
let onClose: (() -> Void)?
var body: some View {
if let app = app {
TerminalSplitRoot(app: app)
TerminalSplitRoot(app: app, onClose: onClose)
}
}
}
@@ -78,13 +79,13 @@ extension Ghostty {
/// one of these in a split tree.
private struct TerminalSplitRoot: View {
@State private var node: SplitNode
/// This is an ignored value because at the root we can't close.
@State private var ignoredRequestClose: Bool = false
@State private var requestClose: Bool = false
let onClose: (() -> Void)?
@FocusedValue(\.ghosttySurfaceTitle) private var surfaceTitle: String?
init(app: ghostty_app_t) {
init(app: ghostty_app_t, onClose: (() ->Void)? = nil) {
self.onClose = onClose
_node = State(wrappedValue: SplitNode.noSplit(.init(app)))
}
@@ -92,7 +93,12 @@ extension Ghostty {
ZStack {
switch (node) {
case .noSplit(let leaf):
TerminalSplitLeaf(leaf: leaf, node: $node, requestClose: $ignoredRequestClose)
TerminalSplitLeaf(leaf: leaf, node: $node, requestClose: $requestClose)
.onChange(of: requestClose) { value in
guard value else { return }
guard let onClose = self.onClose else { return }
onClose()
}
case .horizontal(let container):
TerminalSplitContainer(direction: .horizontal, node: $node, container: container)