From 42493de0989d1a2c27f5c27deb471c6e08d66ad6 Mon Sep 17 00:00:00 2001
From: Justy Null <me@justyn.is>
Date: Fri, 17 Oct 2025 18:39:11 -0700
Subject: [PATCH] fix: make titlebar transparent when using glass background
 style

---
 .../Terminal/Window Styles/TerminalWindow.swift      |  3 +++
 .../TransparentTitlebarTerminalWindow.swift          | 12 +++++++++++-
 2 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/macos/Sources/Features/Terminal/Window Styles/TerminalWindow.swift b/macos/Sources/Features/Terminal/Window Styles/TerminalWindow.swift
index 444ce28bd..6105cac53 100644
--- a/macos/Sources/Features/Terminal/Window Styles/TerminalWindow.swift	
+++ b/macos/Sources/Features/Terminal/Window Styles/TerminalWindow.swift	
@@ -627,6 +627,7 @@ class TerminalWindow: NSWindow {
         let backgroundOpacity: Double
         let macosWindowButtons: Ghostty.MacOSWindowButtons
         let macosBackgroundStyle: Ghostty.MacBackgroundStyle
+        let macosTitlebarStyle: String
         let windowCornerRadius: CGFloat
 
         init() {
@@ -635,6 +636,7 @@ class TerminalWindow: NSWindow {
             self.backgroundOpacity = 1
             self.macosWindowButtons = .visible
             self.macosBackgroundStyle = .defaultStyle
+            self.macosTitlebarStyle = "transparent"
             self.windowCornerRadius = 16
         }
 
@@ -644,6 +646,7 @@ class TerminalWindow: NSWindow {
             self.backgroundOpacity = config.backgroundOpacity
             self.macosWindowButtons = config.macosWindowButtons
             self.macosBackgroundStyle = config.macosBackgroundStyle
+            self.macosTitlebarStyle = config.macosTitlebarStyle
 
             // Set corner radius based on macos-titlebar-style
             // Native, transparent, and hidden styles use 16pt radius
diff --git a/macos/Sources/Features/Terminal/Window Styles/TransparentTitlebarTerminalWindow.swift b/macos/Sources/Features/Terminal/Window Styles/TransparentTitlebarTerminalWindow.swift
index 08d56c83d..eea1956fc 100644
--- a/macos/Sources/Features/Terminal/Window Styles/TransparentTitlebarTerminalWindow.swift	
+++ b/macos/Sources/Features/Terminal/Window Styles/TransparentTitlebarTerminalWindow.swift	
@@ -88,7 +88,17 @@ class TransparentTitlebarTerminalWindow: TerminalWindow {
         // color of the titlebar in native fullscreen view.
         if let titlebarView = titlebarContainer?.firstDescendant(withClassName: "NSTitlebarView") {
             titlebarView.wantsLayer = true
-            titlebarView.layer?.backgroundColor = preferredBackgroundColor?.cgColor
+
+            // For glass background styles, use a transparent titlebar to let the glass effect show through
+            // Only apply this for transparent and tabs titlebar styles
+            let isGlassStyle = derivedConfig.macosBackgroundStyle == .regularGlass ||
+                               derivedConfig.macosBackgroundStyle == .clearGlass
+            let isTransparentTitlebar = derivedConfig.macosTitlebarStyle == "transparent" ||
+                                       derivedConfig.macosTitlebarStyle == "tabs"
+
+            titlebarView.layer?.backgroundColor = (isGlassStyle && isTransparentTitlebar)
+                ? NSColor.clear.cgColor
+                : preferredBackgroundColor?.cgColor
         }
     
         // In all cases, we have to hide the background view since this has multiple subviews