Applied-Software/ghostty
5
0
Fork 0
mirror of https://github.com/ghostty-org/ghostty.git synced 2025-06-06 15:38:39 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1471 from qwerasd205/macos-fix-transparent-titlebar

Browse Source 
(macOS) Fix a couple transparent window + titlebar tabs bugs
This commit is contained in:
Mitchell Hashimoto
2024-02-05 19:05:21 -08:00
committed by GitHub
parent 167ec20f2e 3c0317bf9d
commit ae09a98ffe
2 changed files with 30 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -140,6 +140,18 @@ class TerminalController: NSWindowController, NSWindowDelegate,
} }
} }
private func fixTabBar() {
// We do this to make sure that the tab bar will always re-composite. If we don't,
// then the it will "drag" pieces of the background with it when a transparent
// window is moved around.
//
// There might be a better way to make the tab bar "un-lazy", but I can't find it.
if let window = window, !window.isOpaque {
window.isOpaque = true
window.isOpaque = false
}
}
@objc private func onFrameDidChange(_ notification: NSNotification) { @objc private func onFrameDidChange(_ notification: NSNotification) {
// This is a huge hack to set the proper shortcut for tab selection // This is a huge hack to set the proper shortcut for tab selection
// on tab reordering using the mouse. There is no event, delegate, etc. // on tab reordering using the mouse. There is no event, delegate, etc.
@ -335,6 +347,11 @@ class TerminalController: NSWindowController, NSWindowDelegate,
func windowDidBecomeKey(_ notification: Notification) { func windowDidBecomeKey(_ notification: Notification) {
self.relabelTabs() self.relabelTabs()
self.fixTabBar()
}
func windowDidMove(_ notification: Notification) {
self.fixTabBar()
} }
// Called when the window will be encoded. We handle the data encoding here in the // Called when the window will be encoded. We handle the data encoding here in the

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

@ -29,6 +29,7 @@ class TerminalWindow: NSWindow {
private var windowButtonsBackdrop: NSView? = nil private var windowButtonsBackdrop: NSView? = nil
private var windowDragHandle: WindowDragView? = nil private var windowDragHandle: WindowDragView? = nil
private var storedTitlebarBackgroundColor: CGColor? = nil
// The tab bar controller ID from macOS // The tab bar controller ID from macOS
static private let TabBarController = NSUserInterfaceItemIdentifier("_tabBarController") static private let TabBarController = NSUserInterfaceItemIdentifier("_tabBarController")
@ -45,6 +46,10 @@ class TerminalWindow: NSWindow {
self.toolbar = TerminalToolbar(identifier: "Toolbar") self.toolbar = TerminalToolbar(identifier: "Toolbar")
} }
// Set a custom background on the titlebar - this is required for when
// titlebar tabs is used in conjunction with a transparent background.
self.restoreTitlebarBackground()
// We have to wait before setting the titleVisibility or else it prevents // We have to wait before setting the titleVisibility or else it prevents
// the window from hiding the tab bar when we get down to a single tab. // the window from hiding the tab bar when we get down to a single tab.
DispatchQueue.main.async { DispatchQueue.main.async {
@ -63,6 +68,8 @@ class TerminalWindow: NSWindow {
// Assign a background color to the titlebar area. // Assign a background color to the titlebar area.
func setTitlebarBackground(_ color: CGColor) { func setTitlebarBackground(_ color: CGColor) {
storedTitlebarBackgroundColor = color
guard let titlebarContainer = contentView?.superview?.subviews.first(where: { guard let titlebarContainer = contentView?.superview?.subviews.first(where: {
$0.className == "NSTitlebarContainerView" $0.className == "NSTitlebarContainerView"
}) else { return } }) else { return }
@ -71,6 +78,12 @@ class TerminalWindow: NSWindow {
titlebarContainer.layer?.backgroundColor = color titlebarContainer.layer?.backgroundColor = color
} }
// Make sure the titlebar has the assigned background color.
private func restoreTitlebarBackground() {
guard let color = storedTitlebarBackgroundColor else { return }
setTitlebarBackground(color)
}
// This is called by macOS for native tabbing in order to add the tab bar. We hook into // This is called by macOS for native tabbing in order to add the tab bar. We hook into
// this, detect the tab bar being added, and override its behavior. // this, detect the tab bar being added, and override its behavior.
override func addTitlebarAccessoryViewController(_ childViewController: NSTitlebarAccessoryViewController) { override func addTitlebarAccessoryViewController(_ childViewController: NSTitlebarAccessoryViewController) {