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: make sliding logic a bit more extensible

Browse Source
This commit is contained in:
Mitchell Hashimoto
2024-09-22 21:28:57 -07:00
parent bdd0070ffd
commit 63456d28a5
2 changed files with 50 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
macos/Sources/Features/SlideTerminal/SlideTerminalController.swift
View File

@ -4,7 +4,7 @@ import SwiftUI
import GhosttyKit
/// Controller for the slide-style terminal.
class SlideTerminalController: NSWindowController, TerminalViewDelegate, TerminalViewModel {
class SlideTerminalController: NSWindowController, NSWindowDelegate, TerminalViewDelegate, TerminalViewModel {
override var windowNibName: NSNib.Name? { "SlideTerminal" }
/// The app instance that this terminal view will represent.
@ -40,6 +40,10 @@ class SlideTerminalController: NSWindowController, TerminalViewDelegate, Termina
override func windowDidLoad() {
guard let window = self.window else { return }
// The controller is the window delegate so we can detect events such as
// window close so we can animate out.
window.delegate = self
// The slide window is not restorable (yet!). "Yet" because in theory we can
// make this restorable, but it isn't currently implemented.
window.isRestorable = false
@ -52,7 +56,13 @@ class SlideTerminalController: NSWindowController, TerminalViewDelegate, Termina
))
// Animate the window in
slideWindowIn(window: window, from: position)
slideIn()
}
// MARK: NSWindowDelegate
func windowDidResignKey(_ notification: Notification) {
slideOut()
}
//MARK: TerminalViewDelegate
@ -68,7 +78,17 @@ class SlideTerminalController: NSWindowController, TerminalViewDelegate, Termina
}
}
// MARK: Slide Logic
// MARK: Slide Methods
func slideIn() {
guard let window = self.window else { return }
slideWindowIn(window: window, from: position)
}
func slideOut() {
guard let window = self.window else { return }
slideWindowOut(window: window, to: position)
}
private func slideWindowIn(window: NSWindow, from position: SlideTerminalPosition) {
guard let screen = NSScreen.main else { return }
@ -87,4 +107,13 @@ class SlideTerminalController: NSWindowController, TerminalViewDelegate, Termina
position.setFinal(in: window.animator(), on: screen)
}
}
private func slideWindowOut(window: NSWindow, to position: SlideTerminalPosition) {
guard let screen = NSScreen.main else { return }
NSAnimationContext.runAnimationGroup { context in
context.duration = 0.3
context.timingFunction = .init(name: .easeIn)
position.setInitial(in: window.animator(), on: screen)
}
}
}

24
macos/Sources/Features/SlideTerminal/SlideTerminalPosition.swift
View File

@ -12,9 +12,7 @@ enum SlideTerminalPosition {
switch (self) {
case .top:
window.setFrame(.init(
origin: .init(
x: 0,
y: screen.frame.maxY),
origin: initialOrigin(for: window, on: screen),
size: .init(
width: screen.frame.width,
height: window.frame.height)
@ -31,11 +29,25 @@ enum SlideTerminalPosition {
switch (self) {
case .top:
window.setFrame(.init(
origin: .init(
x: window.frame.origin.x,
y: screen.visibleFrame.maxY - window.frame.height),
origin: finalOrigin(for: window, on: screen),
size: window.frame.size
), display: true)
}
}
/// The initial point origin for this position.
func initialOrigin(for window: NSWindow, on screen: NSScreen) -> CGPoint {
switch (self) {
case .top:
return .init(x: 0, y: screen.frame.maxY)
}
}
/// The final point origin for this position.
func finalOrigin(for window: NSWindow, on screen: NSScreen) -> CGPoint {
switch (self) {
case .top:
return .init(x: window.frame.origin.x, y: screen.visibleFrame.maxY - window.frame.height)
}
}
}