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

macos: set initial window in TerminalWindow awakeFromNib

Browse Source 
Maybe fixes #8736

I thought `windowDidLoad` was early on because its before the window is
shown but apparently not. Let's try `awakeFromNib` which is called
just after the window is loaded from the nib. It is hard to get any
earlier than that.
This commit is contained in:
Mitchell Hashimoto
2025-09-18 13:05:51 -07:00
parent 38dcf0ab59
commit 734d1a13b3
2 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
macos/Sources/Features/Terminal/BaseTerminalController.swift
View File

@@ -863,14 +863,6 @@ class BaseTerminalController: NSWindowController,
// Everything beyond here is setting up the window // Everything beyond here is setting up the window
guard let window else { return } guard let window else { return }
// If there is a hardcoded title in the configuration, we set that
// immediately. Future `set_title` apprt actions will override this
// if necessary but this ensures our window loads with the proper
// title immediately rather than on another event loop tick (see #5934)
if let title = derivedConfig.title {
window.title = title
}
// We always initialize our fullscreen style to native if we can because // We always initialize our fullscreen style to native if we can because
// initialization sets up some state (i.e. observers). If its set already // initialization sets up some state (i.e. observers). If its set already
// somehow we don't do this. // somehow we don't do this.
@@ -1072,20 +1064,17 @@ class BaseTerminalController: NSWindowController,
} }
private struct DerivedConfig { private struct DerivedConfig {
let title: String?
let macosTitlebarProxyIcon: Ghostty.MacOSTitlebarProxyIcon let macosTitlebarProxyIcon: Ghostty.MacOSTitlebarProxyIcon
let windowStepResize: Bool let windowStepResize: Bool
let focusFollowsMouse: Bool let focusFollowsMouse: Bool
init() { init() {
self.title = nil
self.macosTitlebarProxyIcon = .visible self.macosTitlebarProxyIcon = .visible
self.windowStepResize = false self.windowStepResize = false
self.focusFollowsMouse = false self.focusFollowsMouse = false
} }
init(_ config: Ghostty.Config) { init(_ config: Ghostty.Config) {
self.title = config.title
self.macosTitlebarProxyIcon = config.macosTitlebarProxyIcon self.macosTitlebarProxyIcon = config.macosTitlebarProxyIcon
self.windowStepResize = config.windowStepResize self.windowStepResize = config.windowStepResize
self.focusFollowsMouse = config.focusFollowsMouse self.focusFollowsMouse = config.focusFollowsMouse

11
macos/Sources/Features/Terminal/Window Styles/TerminalWindow.swift
View File

@@ -50,6 +50,14 @@ class TerminalWindow: NSWindow {
// Setup our initial config // Setup our initial config
derivedConfig = .init(config) derivedConfig = .init(config)
// If there is a hardcoded title in the configuration, we set that
// immediately. Future `set_title` apprt actions will override this
// if necessary but this ensures our window loads with the proper
// title immediately rather than on another event loop tick (see #5934)
if let title = derivedConfig.title {
self.title = title
}
// If window decorations are disabled, remove our title // If window decorations are disabled, remove our title
if (!config.windowDecorations) { styleMask.remove(.titled) } if (!config.windowDecorations) { styleMask.remove(.titled) }
@@ -432,17 +440,20 @@ class TerminalWindow: NSWindow {
// MARK: Config // MARK: Config
struct DerivedConfig { struct DerivedConfig {
let title: String?
let backgroundColor: NSColor let backgroundColor: NSColor
let backgroundOpacity: Double let backgroundOpacity: Double
let macosWindowButtons: Ghostty.MacOSWindowButtons let macosWindowButtons: Ghostty.MacOSWindowButtons
init() { init() {
self.title = nil
self.backgroundColor = NSColor.windowBackgroundColor self.backgroundColor = NSColor.windowBackgroundColor
self.backgroundOpacity = 1 self.backgroundOpacity = 1
self.macosWindowButtons = .visible self.macosWindowButtons = .visible
} }
init(_ config: Ghostty.Config) { init(_ config: Ghostty.Config) {
self.title = config.title
self.backgroundColor = NSColor(config.backgroundColor) self.backgroundColor = NSColor(config.backgroundColor)
self.backgroundOpacity = config.backgroundOpacity self.backgroundOpacity = config.backgroundOpacity
self.macosWindowButtons = config.macosWindowButtons self.macosWindowButtons = config.macosWindowButtons