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

Merge pull request #1767 from peteschaffner/fix-title-bar-window-theme-regression

Browse Source 
Fix title bar window theme regression
This commit is contained in:
Mitchell Hashimoto
2024-05-17 16:31:42 -04:00
committed by GitHub
parent 6cff87e60e 69a3137956
commit 6f93d1113a
2 changed files with 36 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -166,10 +166,6 @@ class TerminalController: NSWindowController, NSWindowDelegate,
private func syncAppearance() {
guard let window = self.window as? TerminalWindow else { return }
let backgroundColor = OSColor(ghostty.config.backgroundColor)
let appearance = NSAppearance(named: backgroundColor.isLightColor ? .aqua : .darkAqua)
window.appearance = appearance
// Set the font for the window and tab titles.
if let titleFontName = ghostty.config.windowTitleFontFamily {
window.titlebarFont = NSFont(name: titleFontName, size: NSFont.systemFontSize)
@ -177,6 +173,7 @@ class TerminalController: NSWindowController, NSWindowDelegate,
window.titlebarFont = nil
}
let backgroundColor = OSColor(ghostty.config.backgroundColor)
window.backgroundColor = backgroundColor
window.titlebarColor = backgroundColor.withAlphaComponent(ghostty.config.backgroundOpacity)
window.updateTabBar()
@ -258,6 +255,11 @@ class TerminalController: NSWindowController, NSWindowDelegate,
// This makes sure our titlebar renders correctly when there is a transparent background
window.titlebarColor = backgroundColor.withAlphaComponent(ghostty.config.backgroundOpacity)
// Make sure our theme is set on the window so styling is correct.
if let windowTheme = ghostty.config.windowTheme {
window.windowTheme = .init(rawValue: windowTheme)
}
// Handle titlebar tabs config option. Something about what we do while setting up the
// titlebar tabs interferes with the window restore process unless window.tabbingMode
// is set to .preferred, so we set it, and switch back to automatic as soon as we can.

42
macos/Sources/Features/Terminal/TerminalWindow.swift
View File

@ -76,10 +76,14 @@ class TerminalWindow: NSWindow {
}
}
// The window theme configuration from Ghostty. This is used to control some
// behaviors that don't look quite right in certain situations.
var windowTheme: TerminalWindowTheme?
// We only need to set this once, but need to do it after the window has been created in order
// to determine if the theme is using a very dark background, in which case we don't want to
// remove the effect view if the default tab bar is being used since the effect created in
// `updateTabsForVeryDarkBackgrounds`.
// `updateTabsForVeryDarkBackgrounds` creates a confusing visual design.
private var effectViewIsHidden = false
override func becomeKey() {
@ -119,6 +123,24 @@ class TerminalWindow: NSWindow {
override func update() {
super.update()
if titlebarTabs {
updateTabsForVeryDarkBackgrounds()
// This is called when we open, close, switch, and reorder tabs, at which point we determine if the
// first tab in the tab bar is selected. If it is, we make the `windowButtonsBackdrop` color the same
// as that of the active tab (i.e. the titlebar's background color), otherwise we make it the same
// color as the background of unselected tabs.
if let index = windowController?.window?.tabbedWindows?.firstIndex(of: self) {
windowButtonsBackdrop?.isHighlighted = index == 0
}
}
updateResetZoomTitlebarButtonVisibility()
// The remainder of the styles we only apply if we're on "auto" theming
// because they conflict with the appearance being forced a certain
// direction. See issue #1709.
guard let windowTheme, windowTheme == .auto else { return }
titlebarSeparatorStyle = tabbedWindows != nil && !titlebarTabs ? .line : .none
if !effectViewIsHidden {
@ -137,20 +159,8 @@ class TerminalWindow: NSWindow {
effectViewIsHidden = true
}
if titlebarTabs {
updateTabsForVeryDarkBackgrounds()
// This is called when we open, close, switch, and reorder tabs, at which point we determine if the
// first tab in the tab bar is selected. If it is, we make the `windowButtonsBackdrop` color the same
// as that of the active tab (i.e. the titlebar's background color), otherwise we make it the same
// color as the background of unselected tabs.
if let index = windowController?.window?.tabbedWindows?.firstIndex(of: self) {
windowButtonsBackdrop?.isHighlighted = index == 0
}
}
updateNewTabButtonOpacity()
updateNewTabButtonImage()
updateResetZoomTitlebarButtonVisibility()
}
override func updateConstraintsIfNeeded() {
@ -626,3 +636,9 @@ fileprivate class WindowButtonsBackdropView: NSView {
layer?.addSublayer(overlayLayer)
}
}
enum TerminalWindowTheme: String {
case auto
case light
case dark
}