Skip to content
Merged
Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
574970e
Extract window chrome from ContentView
azooz2003-bit Jun 15, 2026
2647334
Fix window chrome regression gates
azooz2003-bit Jun 16, 2026
2bc5573
Merge remote-tracking branch 'origin/main' into feat-contentview-decomp
azooz2003-bit Jun 16, 2026
b2d5420
Fix dictation text merger package lint
azooz2003-bit Jun 16, 2026
87001f3
Import CmuxAppKitSupportUI in pane-background test after chrome move
azooz2003-bit Jun 16, 2026
651798b
Pass windowBackgroundPolicy to moved shouldApply in glass test
azooz2003-bit Jun 16, 2026
b38499b
Merge remote-tracking branch 'origin/main' into feat-contentview-decomp
azooz2003-bit Jun 16, 2026
b372dd8
Fix re-sync test-target break + new-file concurrency warnings
azooz2003-bit Jun 16, 2026
b5d70eb
Merge remote-tracking branch 'origin/main' into feat-contentview-decomp
azooz2003-bit Jun 16, 2026
9a7220d
Link Bonsplit into cmuxTests target after re-sync
azooz2003-bit Jun 16, 2026
ccb90f8
Restore cmuxTests Bonsplit link dropped in re-sync
azooz2003-bit Jun 16, 2026
d52073e
Re-sync onto origin/main: relocate WindowChrome into Packages/macOS/C…
azooz2003-bit Jun 17, 2026
b26c4de
Merge remote-tracking branch 'origin/main' into feat-contentview-decomp
azooz2003-bit Jun 17, 2026
03c3581
WindowChrome: folder-separate by concern + package README (Aziz review)
azooz2003-bit Jun 17, 2026
09d888a
Add explicit import CmuxFoundation to WindowGlassEffect+Views
azooz2003-bit Jun 17, 2026
c65c49f
Add explicit import Foundation to WindowChromeSidebarPresetOption
azooz2003-bit Jun 17, 2026
795323d
WindowChrome: split AppWindowBackdropControllerDependencies into its …
azooz2003-bit Jun 17, 2026
dffbd4e
Merge remote-tracking branch 'origin/main' into feat-contentview-decomp
azooz2003-bit Jun 17, 2026
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 9 additions & 10 deletions .github/swift-file-length-budget.tsv
Original file line number Diff line number Diff line change
Expand Up @@ -3,31 +3,31 @@
# Reduce counts as files shrink. CI fails if tracked files exceed this budget.
34475 CLI/cmux.swift
17894 Sources/AppDelegate.swift
16714 Sources/ContentView.swift
16056 Sources/ContentView.swift
14829 Sources/TerminalController.swift
13358 Sources/Panels/BrowserPanel.swift
13017 Sources/Workspace.swift
12124 Sources/GhosttyTerminalView.swift
13359 Sources/Panels/BrowserPanel.swift
13018 Sources/Workspace.swift
12137 Sources/GhosttyTerminalView.swift
12115 cmuxTests/AppDelegateShortcutRoutingTests.swift
9331 cmuxTests/CLINotifyProcessIntegrationRegressionTests.swift
7925 Sources/Panels/BrowserPanelView.swift
7355 cmuxTests/WorkspaceUnitTests.swift
7221 cmuxTests/WorkspaceRemoteConnectionTests.swift
6317 cmuxTests/SessionPersistenceTests.swift
6299 cmuxTests/GhosttyConfigTests.swift
6300 cmuxTests/GhosttyConfigTests.swift
6156 Sources/TabManager.swift
6153 CLI/cmux_open.swift
6074 Sources/TextBoxInput.swift
5925 cmuxTests/TerminalAndGhosttyTests.swift
5558 Packages/CmuxMobileShell/Sources/CmuxMobileShell/MobileShellComposite.swift
5526 cmuxTests/BrowserConfigTests.swift
4921 Sources/cmuxApp.swift
4922 Sources/cmuxApp.swift
4467 Sources/Panels/FilePreviewPanel.swift
4400 cmuxTests/BrowserPanelTests.swift
4227 Sources/BrowserWindowPortal.swift
4225 Sources/BrowserWindowPortal.swift
3937 Sources/Feed/FeedPanelView.swift
3926 cmuxTests/TabManagerUnitTests.swift
3903 cmuxTests/WindowAndDragTests.swift
3906 cmuxTests/WindowAndDragTests.swift
3734 Packages/CmuxMobileTerminal/Sources/CmuxMobileTerminal/GhosttySurfaceView.swift
3699 cmuxTests/CLIGenericHookPersistenceTests.swift
3397 Sources/CmuxConfig.swift
Expand All @@ -42,7 +42,7 @@
2395 Sources/Mobile/MobileHostService.swift
2355 Sources/FileExplorerView.swift
2328 cmuxTests/CJKIMEInputTests.swift
2259 Sources/TerminalWindowPortal.swift
2257 Sources/TerminalWindowPortal.swift
2236 Sources/TerminalNotificationStore.swift
2117 cmuxTests/CmuxConfigTests.swift
2092 cmuxTests/ShortcutAndCommandPaletteTests.swift
Expand Down Expand Up @@ -184,7 +184,6 @@
554 Sources/Panels/BrowserAutomation.swift
551 Packages/CmuxSettingsUI/Sources/CmuxSettingsUI/Sections/BrowserSection.swift
547 Packages/CmuxSocketControl/Sources/CmuxSocketControl/SocketControlSettings.swift
547 Sources/Windowing/WindowGlassEffect.swift
541 Packages/CmuxControlSocket/Sources/CmuxControlSocket/Coordinator/Pane/ControlCommandCoordinator+Pane.swift
540 Packages/CmuxWorkspaces/Sources/CmuxWorkspaces/Coordinators/WorkspaceReorderCoordinator.swift
539 CLI/CMUXCLI+Themes.swift
Expand Down
8 changes: 8 additions & 0 deletions Packages/CmuxAppKitSupportUI/Package.swift
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,17 @@ let package = Package(
targets: ["CmuxAppKitSupportUI"]
),
],
dependencies: [
.package(path: "../CmuxFoundation"),
.package(path: "../CmuxWorkspaceWindow"),
],
targets: [
.target(
name: "CmuxAppKitSupportUI",
dependencies: [
"CmuxFoundation",
"CmuxWorkspaceWindow",
],
swiftSettings: [
.swiftLanguageMode(.v6),
.enableUpcomingFeature("ExistentialAny"),
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
public import CmuxFoundation

extension GhosttyBackgroundBlur {
/// The window-glass style for this blur mode, or `nil` when the mode is not
/// backed by native macOS glass.
public var windowGlassStyle: WindowGlassEffectStyle? {
switch self {
case .macosGlassRegular:
return .regular
case .macosGlassClear:
return .clear
case .disabled, .radius:
return nil
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
/// Rendering owner for terminal backdrop pixels.
public enum GhosttyTerminalBackdropRenderingMode: Equatable, Sendable {
/// The AppKit window host paints the terminal backdrop.
case windowHostBackdrop

/// Ghostty's renderer paints the terminal background image.
case ghosttyRendererOwnedBackgroundImage

/// Whether the AppKit window host owns the backdrop pixels.
public var usesWindowHostBackdrop: Bool {
self == .windowHostBackdrop
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,49 @@
import AppKit
import SwiftUI

/// Non-hit-testing AppKit color fill used where SwiftUI colors blend poorly
/// with transparent window backdrops.
struct LayerBackedBackdropColor: NSViewRepresentable {
let color: NSColor

func makeNSView(context _: Context) -> NSView {
let view = NonHitTestingLayerBackedColorView()
view.setBackdropColor(color)
return view
}

func updateNSView(_ nsView: NSView, context _: Context) {
(nsView as? NonHitTestingLayerBackedColorView)?.setBackdropColor(color)
}

private final class NonHitTestingLayerBackedColorView: NSView {
override init(frame frameRect: NSRect) {
super.init(frame: frameRect)
wantsLayer = true
layer?.masksToBounds = true
layer?.isOpaque = false
}

required init?(coder: NSCoder) {
super.init(coder: coder)
wantsLayer = true
layer?.masksToBounds = true
layer?.isOpaque = false
}

override var isOpaque: Bool { false }

override func hitTest(_ point: NSPoint) -> NSView? {
nil
}

func setBackdropColor(_ color: NSColor) {
wantsLayer = true
CATransaction.begin()
CATransaction.setDisableActions(true)
layer?.backgroundColor = color.cgColor
layer?.isOpaque = color.alphaComponent >= 1
CATransaction.commit()
}
}
}
Loading
Loading