From def3a62fb90a927274effbfec0163c30317e4349 Mon Sep 17 00:00:00 2001 From: johnseth97 <17620345+johnseth97@users.noreply.github.com> Date: Sat, 19 Oct 2024 01:03:05 -0400 Subject: [PATCH 1/2] Modified `window-decorations = none` option on macos --- .../Features/Terminal/TerminalController.swift | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/macos/Sources/Features/Terminal/TerminalController.swift b/macos/Sources/Features/Terminal/TerminalController.swift index 70df52b4b..d47565fd5 100644 --- a/macos/Sources/Features/Terminal/TerminalController.swift +++ b/macos/Sources/Features/Terminal/TerminalController.swift @@ -211,9 +211,16 @@ class TerminalController: BaseTerminalController { window.restorationClass = TerminalWindowRestoration.self window.identifier = .init(String(describing: TerminalWindowRestoration.self)) } - + // If window decorations are disabled, remove our title - if (!ghostty.config.windowDecorations) { window.styleMask.remove(.titled) } + if (!ghostty.config.windowDecorations) { + window.titleVisibility = .hidden + window.standardWindowButton(.closeButton)?.isHidden = true + window.standardWindowButton(.miniaturizeButton)?.isHidden = true + window.standardWindowButton(.zoomButton)?.isHidden = true + window.titlebarAppearsTransparent = true + window.styleMask.insert(.fullSizeContentView) + } // Terminals typically operate in sRGB color space and macOS defaults // to "native" which is typically P3. There is a lot more resources From 7f898ce01f89e5aa38751ead579d6327e9f8489a Mon Sep 17 00:00:00 2001 From: johnseth97 <17620345+johnseth97@users.noreply.github.com> Date: Tue, 22 Oct 2024 22:45:03 -0400 Subject: [PATCH 2/2] Basic proxy icons showing Removed changes that accidentally carried over from another local branch. Basic Proxy Icons showing --- .../Features/Terminal/BaseTerminalController.swift | 11 ++++++++++- .../Features/Terminal/TerminalController.swift | 9 +-------- 2 files changed, 11 insertions(+), 9 deletions(-) diff --git a/macos/Sources/Features/Terminal/BaseTerminalController.swift b/macos/Sources/Features/Terminal/BaseTerminalController.swift index ea35790fd..96c9188a7 100644 --- a/macos/Sources/Features/Terminal/BaseTerminalController.swift +++ b/macos/Sources/Features/Terminal/BaseTerminalController.swift @@ -232,9 +232,18 @@ class BaseTerminalController: NSWindowController, func titleDidChange(to: String) { guard let window else { return } - + // Set the main window title window.title = to + + // Get the current working directory from the focused surface + if let pwd = focusedSurface?.pwd { + // Set the window's representedURL to the current working directory + window.representedURL = URL(fileURLWithPath: pwd) + } else { + // If we don't have a pwd, set representedURL to nil + window.representedURL = nil + } } func cellSizeDidChange(to: NSSize) { diff --git a/macos/Sources/Features/Terminal/TerminalController.swift b/macos/Sources/Features/Terminal/TerminalController.swift index 4aaf3e1da..0b1ff3b72 100644 --- a/macos/Sources/Features/Terminal/TerminalController.swift +++ b/macos/Sources/Features/Terminal/TerminalController.swift @@ -213,14 +213,7 @@ class TerminalController: BaseTerminalController { } // If window decorations are disabled, remove our title - if (!ghostty.config.windowDecorations) { - window.titleVisibility = .hidden - window.standardWindowButton(.closeButton)?.isHidden = true - window.standardWindowButton(.miniaturizeButton)?.isHidden = true - window.standardWindowButton(.zoomButton)?.isHidden = true - window.titlebarAppearsTransparent = true - window.styleMask.insert(.fullSizeContentView) - } + if (!ghostty.config.windowDecorations) { window.styleMask.remove(.titled) } // Terminals typically operate in sRGB color space and macOS defaults // to "native" which is typically P3. There is a lot more resources