Applied-Software/ghostty
5
0
Fork 0
mirror of https://github.com/ghostty-org/ghostty.git synced 2025-08-02 14:57:31 +03:00
Code Issues Packages Projects Releases Wiki Activity

macos: close and refocus split work while zoomed

Browse Source
This commit is contained in:
Mitchell Hashimoto
2023-09-02 16:47:48 -07:00
parent 76ae039701
commit e657a0f671
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -248,12 +248,16 @@ extension Ghostty {
} }
.navigationTitle(surfaceTitle ?? "Ghostty") .navigationTitle(surfaceTitle ?? "Ghostty")
} else { } else {
// On split, we want to reset the zoom state. // On these events we want to reset the split state and call it.
let pubSplit = center.publisher(for: Notification.ghosttyNewSplit, object: zoomedSurface!) let pubSplit = center.publisher(for: Notification.ghosttyNewSplit, object: zoomedSurface!)
let pubClose = center.publisher(for: Notification.ghosttyCloseSurface, object: zoomedSurface!)
let pubFocus = center.publisher(for: Notification.ghosttyFocusSplit, object: zoomedSurface!)
ZStack {} ZStack {}
.onReceive(pubZoom) { onZoomReset(notification: $0) } .onReceive(pubZoom) { onZoomReset(notification: $0) }
.onReceive(pubSplit) { onZoomReset(notification: $0) } .onReceive(pubSplit) { onZoomReset(notification: $0) }
.onReceive(pubClose) { onZoomReset(notification: $0) }
.onReceive(pubFocus) { onZoomReset(notification: $0) }
} }
} }
@ -288,10 +292,10 @@ extension Ghostty {
DispatchQueue.main.async { DispatchQueue.main.async {
Ghostty.moveFocus(to: surfaceView) Ghostty.moveFocus(to: surfaceView)
// If the notification is a new split notification, we want to re-publish // If the notification is not a toggle zoom notification, we want to re-publish
// it after a short delay so that the split tree has a chance to re-establish // it after a short delay so that the split tree has a chance to re-establish
// so the proper view gets this notification. // so the proper view gets this notification.
if (notification.name == Notification.ghosttyNewSplit) { if (notification.name != Notification.didToggleSplitZoom) {
// We have to wait ANOTHER tick since we just established. // We have to wait ANOTHER tick since we just established.
DispatchQueue.main.async { DispatchQueue.main.async {
NotificationCenter.default.post(notification) NotificationCenter.default.post(notification)