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

Extract window title color updates into private function

Browse Source 
This extracts the window title update logic into a new function so we
can avoid calling syncAppearance on `windowDidBecomeKey` which is much
heavier than updating just the titles.
This commit is contained in:
Blake Williams
2025-01-08 20:10:13 -05:00
parent f79ae518d4
commit 3c17b9176e
1 changed files with 46 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -249,45 +249,7 @@ class TerminalController: BaseTerminalController {
guard window.hasStyledTabs else { return } guard window.hasStyledTabs else { return }
// Our background color depends on if our focused surface borders the top or not. updateWindowTitleColors(surfaceConfig)
// If it does, we match the focused surface. If it doesn't, we use the app
// configuration.
let backgroundColor: OSColor
let foregroundColor: OSColor
if let surfaceTree {
if let focusedSurface, surfaceTree.doesBorderTop(view: focusedSurface) {
// Similar to above, an alpha component of "0" causes compositor issues, so
// we use 0.001. See: https://github.com/ghostty-org/ghostty/pull/4308
backgroundColor = OSColor(focusedSurface.backgroundColor ?? surfaceConfig.backgroundColor).withAlphaComponent(0.001)
foregroundColor = OSColor(focusedSurface.foregroundColor ?? surfaceConfig.foregroundColor)
} else {
// We don't have a focused surface or our surface doesn't border the
// top. We choose to match the color of the top-left most surface.
backgroundColor = OSColor(surfaceTree.topLeft().backgroundColor ?? derivedConfig.backgroundColor)
foregroundColor = OSColor(surfaceTree.topLeft().foregroundColor ?? derivedConfig.foregroundColor)
}
} else {
backgroundColor = OSColor(self.derivedConfig.backgroundColor)
foregroundColor = OSColor(self.derivedConfig.foregroundColor)
}
window.titlebarColor = backgroundColor.withAlphaComponent(surfaceConfig.backgroundOpacity)
window.titleForegroundColor = foregroundColor
if (window.isOpaque) {
// Bg color is only synced if we have no transparency. This is because
// the transparency is handled at the surface level (window.backgroundColor
// ignores alpha components)
window.backgroundColor = backgroundColor
// If there is transparency, calling this will make the titlebar opaque
// so we only call this if we are opaque.
window.updateTabBar()
}
guard let windows = self.window?.tabbedWindows as? [TerminalWindow] else { return }
for (w) in windows {
w.titleForegroundColor = window.titleForegroundColor
}
} }
private func setInitialWindowPosition(x: Int16?, y: Int16?, windowDecorations: Bool) { private func setInitialWindowPosition(x: Int16?, y: Int16?, windowDecorations: Bool) {
@ -500,7 +462,7 @@ class TerminalController: BaseTerminalController {
self.fixTabBar() self.fixTabBar()
if let focusedSurface { if let focusedSurface {
self.syncAppearance(focusedSurface.derivedConfig) self.updateWindowTitleColors(focusedSurface.derivedConfig)
} }
} }
@ -681,6 +643,50 @@ class TerminalController: BaseTerminalController {
} }
} }
private func updateWindowTitleColors(_ surfaceConfig: Ghostty.SurfaceView.DerivedConfig) {
guard let window = self.window as? TerminalWindow else { return }
// Our background color depends on if our focused surface borders the top or not.
// If it does, we match the focused surface. If it doesn't, we use the app
// configuration.
let backgroundColor: OSColor
let foregroundColor: OSColor
if let surfaceTree {
if let focusedSurface, surfaceTree.doesBorderTop(view: focusedSurface) {
// Similar to above, an alpha component of "0" causes compositor issues, so
// we use 0.001. See: https://github.com/ghostty-org/ghostty/pull/4308
backgroundColor = OSColor(focusedSurface.backgroundColor ?? surfaceConfig.backgroundColor).withAlphaComponent(0.001)
foregroundColor = OSColor(focusedSurface.foregroundColor ?? surfaceConfig.foregroundColor)
} else {
// We don't have a focused surface or our surface doesn't border the
// top. We choose to match the color of the top-left most surface.
backgroundColor = OSColor(surfaceTree.topLeft().backgroundColor ?? derivedConfig.backgroundColor)
foregroundColor = OSColor(surfaceTree.topLeft().foregroundColor ?? derivedConfig.foregroundColor)
}
} else {
backgroundColor = OSColor(self.derivedConfig.backgroundColor)
foregroundColor = OSColor(self.derivedConfig.foregroundColor)
}
window.titlebarColor = backgroundColor.withAlphaComponent(surfaceConfig.backgroundOpacity)
window.titleForegroundColor = foregroundColor
if (window.isOpaque) {
// Bg color is only synced if we have no transparency. This is because
// the transparency is handled at the surface level (window.backgroundColor
// ignores alpha components)
window.backgroundColor = backgroundColor
// If there is transparency, calling this will make the titlebar opaque
// so we only call this if we are opaque.
window.updateTabBar()
}
guard let windows = self.window?.tabbedWindows as? [TerminalWindow] else { return }
for (w) in windows {
w.titleForegroundColor = window.titleForegroundColor
}
}
//MARK: - Notifications //MARK: - Notifications
@objc private func onMoveTab(notification: SwiftUI.Notification) { @objc private func onMoveTab(notification: SwiftUI.Notification) {