mirrors/ghostty
1
0
Fork 0
mirror of https://github.com/ghostty-org/ghostty.git synced 2026-04-06 07:38:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

Revert "macOS: filter proper intrinsicContentSize when opening new window (#11257)"

Browse Source 
This reverts commit 3445c9afda, reversing
changes made to 1e981f858a.
This commit is contained in:
Mitchell Hashimoto
2026-03-09 08:33:24 -07:00
parent 3445c9afda
commit dd3d72c3de
1 changed files with 13 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

49
macos/Sources/Features/Terminal/TerminalController.swift
View File

@@ -57,9 +57,6 @@ class TerminalController: BaseTerminalController, TabGroupCloseCoordinator.Contr
/// The notification cancellable for focused surface property changes.
private var surfaceAppearanceCancellables: Set<AnyCancellable> = []
/// The KVO cancellable for `window.contentView.intrinsicContentSize` changes.
private var contentIntrinsicContentSizeCancellable: AnyCancellable?
/// This will be set to the initial frame of the window from the xib on load.
private var initialFrame: NSRect?
@@ -1041,10 +1038,9 @@ class TerminalController: BaseTerminalController, TabGroupCloseCoordinator.Contr
}
// Initialize our content view to the SwiftUI root
let contentView = TerminalViewContainer {
window.contentView = TerminalViewContainer {
TerminalView(ghostty: ghostty, viewModel: self, delegate: self)
}
window.contentView = contentView
// If we have a default size, we want to apply it.
if let defaultSize {
@@ -1053,21 +1049,17 @@ class TerminalController: BaseTerminalController, TabGroupCloseCoordinator.Contr
// Frames can be applied immediately
defaultSize.apply(to: window)
case let .contentIntrinsicSize(minSize):
// We wait for the first proper content intrinsic size,
// after AppKit laid out our SwiftUI views.
contentIntrinsicContentSizeCancellable = contentView.publisher(for: \.intrinsicContentSize)
.filter { $0.width >= minSize.width && $0.height >= minSize.height }
.first()
.sink { [weak self, weak window] _ in
guard let self, let window else { return }
defaultSize.apply(to: window)
if let screen = window.screen ?? NSScreen.main {
let frame = self.adjustForWindowPosition(frame: window.frame, on: screen)
window.setFrameOrigin(frame.origin)
}
contentIntrinsicContentSizeCancellable = nil
case .contentIntrinsicSize:
// Content intrinsic size requires a short delay so that AppKit
// can layout our SwiftUI views.
DispatchQueue.main.asyncAfter(deadline: .now() + .microseconds(10_000)) { [weak self, weak window] in
guard let self, let window else { return }
defaultSize.apply(to: window)
if let screen = window.screen ?? NSScreen.main {
let frame = self.adjustForWindowPosition(frame: window.frame, on: screen)
window.setFrameOrigin(frame.origin)
}
}
}
}
@@ -1568,21 +1560,6 @@ class TerminalController: BaseTerminalController, TabGroupCloseCoordinator.Contr
self.windowPositionX = config.windowPositionX
self.windowPositionY = config.windowPositionY
}
/// The minimum size a window can be resized to as of macOS 26.3, it should cover most cases.
///
/// We use this to filter incorrect intrinsicContentSize values when positioning a new window.
fileprivate var minimumWindowSize: CGSize {
switch macosTitlebarStyle {
case "native", "transparent":
CGSize(width: 105 + 1, height: 33 + 1)
case "tabs":
CGSize(width: 90 + 1, height: 48 + 1)
// hidden or others
default:
CGSize(width: 27 + 1, height: 40 + 1)
}
}
}
}
@@ -1630,7 +1607,7 @@ extension TerminalController {
case frame(NSRect)
/// A content size, set with `window.setContentSize`
case contentIntrinsicSize(_ minimum: CGSize)
case contentIntrinsicSize
func isChanged(for window: NSWindow) -> Bool {
switch self {
@@ -1667,7 +1644,7 @@ extension TerminalController {
} else if focusedSurface?.initialSize != nil {
// Initial size as requested by the configuration (e.g. `window-width`)
// takes next priority.
return .contentIntrinsicSize(derivedConfig.minimumWindowSize)
return .contentIntrinsicSize
} else if let initialFrame {
// The initial frame we had when we started otherwise.
return .frame(initialFrame)