diff --git a/Packages/macOS/CmuxNext/Sources/CmuxNextApp/WindowRootView.swift b/Packages/macOS/CmuxNext/Sources/CmuxNextApp/WindowRootView.swift index 55b60993de39..b6c4d6a43902 100644 --- a/Packages/macOS/CmuxNext/Sources/CmuxNextApp/WindowRootView.swift +++ b/Packages/macOS/CmuxNext/Sources/CmuxNextApp/WindowRootView.swift @@ -380,7 +380,7 @@ final class WindowRootView: NSView, WindowSurfacePainting { var backdrop: WindowBackdrop { WindowBackdrop(themeTokens, reduceTransparency: reduceTransparency(), art: themeScope.backdropArt, selection: themeScope.backdropSelection, tuning: themeScope.appearanceTuning, - tintOpacity: themeScope.backdropTintOpacity) + tintOpacity: themeScope.backdropTintOpacity, legibility: themeScope.artLegibility) } /// An opaque window paints the solid background on this layer. Over a diff --git a/Packages/macOS/CmuxNext/Sources/CmuxNextDesign/ArtLegibility.swift b/Packages/macOS/CmuxNext/Sources/CmuxNextDesign/ArtLegibility.swift new file mode 100644 index 000000000000..5881e1f88e4c --- /dev/null +++ b/Packages/macOS/CmuxNext/Sources/CmuxNextDesign/ArtLegibility.swift @@ -0,0 +1,12 @@ +/// Which text the window's glass keeps readable over background art (`appearance.glassLegibility`). +/// The glass's tint never goes below the least opacity at which these roles keep their contrast +/// over the art (``BackdropArtRange``), so this decides how much of the art shows. The live choice +/// lives on the theme scopes (``ThemeScope/artLegibility``). +public nonisolated enum ArtLegibility: String, CaseIterable, Sendable { + /// Primary text at WCAG AA body contrast, as iOS glass does over a wallpaper: secondary and + /// tertiary text may read below their contrast over the art's brightest or darkest parts, and + /// much more of the art shows (Leo 2026-10-18: "IOS IOS"). + case primary + /// Every text role at its contrast over any part of the art: denser glass. + case all +} diff --git a/Packages/macOS/CmuxNext/Sources/CmuxNextDesign/BackdropArtRange.swift b/Packages/macOS/CmuxNext/Sources/CmuxNextDesign/BackdropArtRange.swift index 826310b3c95c..d8aff84e575c 100644 --- a/Packages/macOS/CmuxNext/Sources/CmuxNextDesign/BackdropArtRange.swift +++ b/Packages/macOS/CmuxNext/Sources/CmuxNextDesign/BackdropArtRange.swift @@ -47,16 +47,19 @@ public nonisolated struct BackdropArtRange: Sendable, Equatable { } public nonisolated extension ThemeTokens { - /// The text roles with the contrast each needs over art: primary and secondary text at WCAG - /// AA body contrast, tertiary text and status marks at the mark contrast. - var backdropTexts: [(color: ThemeRGB, contrast: Double)] { - [(textPrimary, Self.minimumTextContrast), (textSecondary, Self.minimumTextContrast), - (textTertiary, Self.minimumMarkContrast)] + /// The text roles with the contrast each needs over art: primary text at WCAG AA body + /// contrast, and with ``ArtLegibility/all`` secondary text at it too and tertiary text and + /// status marks at the mark contrast. + func backdropTexts(_ legibility: ArtLegibility) -> [(color: ThemeRGB, contrast: Double)] { + let primary = [(color: textPrimary, contrast: Self.minimumTextContrast)] + guard legibility == .all else { return primary } + return primary + [(textSecondary, Self.minimumTextContrast), (textTertiary, Self.minimumMarkContrast)] } - /// The least window tint over `art`, at or above `requested`, that keeps ``backdropTexts`` - /// legible on the surface color. - func legibleTintOpacity(over art: BackdropArtRange = .any, requested: Double) -> Double { - art.scrimOpacity(texts: backdropTexts, scrim: surfaceBackground.withAlpha(1), requested: requested) + /// The least window tint over `art`, at or above `requested`, that keeps + /// ``backdropTexts(_:)`` legible on the surface color. + func legibleTintOpacity(over art: BackdropArtRange = .any, requested: Double, + legibility: ArtLegibility) -> Double { + art.scrimOpacity(texts: backdropTexts(legibility), scrim: surfaceBackground.withAlpha(1), requested: requested) } } diff --git a/Packages/macOS/CmuxNext/Sources/CmuxNextDesign/ThemeScope.swift b/Packages/macOS/CmuxNext/Sources/CmuxNextDesign/ThemeScope.swift index a6fbefcb94e5..c7cc550fe685 100644 --- a/Packages/macOS/CmuxNext/Sources/CmuxNextDesign/ThemeScope.swift +++ b/Packages/macOS/CmuxNext/Sources/CmuxNextDesign/ThemeScope.swift @@ -45,6 +45,10 @@ public final class ThemeScope { /// Plain glass here even when an ancestor has art (``pinBackdrop(_:)``). private var pinsNoBackdrop = false private var selectedAppearanceTuning: AppearanceTuning? + /// The text the glass keeps readable over art (`appearance.glassLegibility`), inherited like + /// art: the settings set it on ``app``. + public var artLegibility: ArtLegibility { selectedArtLegibility ?? parent?.artLegibility ?? .primary } + private var selectedArtLegibility: ArtLegibility? /// The user's per-surface backgrounds (`appearance.surfaces`), inherited /// like art: one app-wide setting, read by every surface's owner through /// `Palette.fill(for:)`. @@ -106,6 +110,16 @@ public final class ThemeScope { } } + /// Changes which text the glass keeps readable over art (``ArtLegibility``) here and in the + /// descendants that inherit it, and repaints them: the tint floor over art moves with it. + public func setArtLegibility(_ legibility: ArtLegibility) { + ThemeRepaint.batch { + guard selectedArtLegibility != legibility else { return } + selectedArtLegibility = legibility + repaintBackdropArt() + } + } + /// Changes live tuning without changing theme colors or persisted settings. public func setAppearanceTuning(_ tuning: AppearanceTuning) { ThemeRepaint.batch { @@ -133,6 +147,7 @@ public final class ThemeScope { var tint: Double? var surfaces: SurfaceBackgrounds var tuning: AppearanceTuning + var legibility: ArtLegibility } private var displayedBackdrop: BackdropKey? @@ -140,7 +155,7 @@ public final class ThemeScope { /// background changed with it (a child with its own pick keeps its views as they are). private func repaintBackdropArt(force: Bool = true) { let key = BackdropKey(selection: backdropSelection, tint: backdropTintOpacity, - surfaces: surfaceBackgrounds, tuning: appearanceTuning) + surfaces: surfaceBackgrounds, tuning: appearanceTuning, legibility: artLegibility) guard force || key != displayedBackdrop else { return } displayedBackdrop = key // Art Color: another work is another accent. diff --git a/Packages/macOS/CmuxNext/Sources/CmuxNextDesign/WindowBackdrop+Current.swift b/Packages/macOS/CmuxNext/Sources/CmuxNextDesign/WindowBackdrop+Current.swift index f8ca7ca0cdc4..8d13f57e350d 100644 --- a/Packages/macOS/CmuxNext/Sources/CmuxNextDesign/WindowBackdrop+Current.swift +++ b/Packages/macOS/CmuxNext/Sources/CmuxNextDesign/WindowBackdrop+Current.swift @@ -4,7 +4,9 @@ public extension WindowBackdrop { /// scope's art selection (the app's outside a scope), so over art the panes stay clear glass /// and the art reads through the window's one legible tint. @MainActor static func current(_ tokens: ThemeTokens, reduceTransparency: Bool = false) -> WindowBackdrop { - WindowBackdrop(tokens, reduceTransparency: reduceTransparency, selection: ThemeContext.activeBackdropSelection) + // Glass Over Art is one app-wide setting (`appearance.glassLegibility`), set on the app scope. + WindowBackdrop(tokens, reduceTransparency: reduceTransparency, selection: ThemeContext.activeBackdropSelection, + legibility: ThemeScope.app.artLegibility) } } @@ -15,7 +17,8 @@ public extension ThemeScope { var shownWindowOpacity: Double { guard backdropSelection != nil else { return input.backgroundOpacity } let backdrop = WindowBackdrop(tokens, art: backdropArt, selection: backdropSelection, - tuning: appearanceTuning, tintOpacity: backdropTintOpacity) + tuning: appearanceTuning, tintOpacity: backdropTintOpacity, + legibility: artLegibility) return backdrop.isOpaque ? input.backgroundOpacity : backdrop.tintOpacity } } diff --git a/Packages/macOS/CmuxNext/Sources/CmuxNextDesign/WindowBackdrop.swift b/Packages/macOS/CmuxNext/Sources/CmuxNextDesign/WindowBackdrop.swift index 0ba587a052a1..226d28f26983 100644 --- a/Packages/macOS/CmuxNext/Sources/CmuxNextDesign/WindowBackdrop.swift +++ b/Packages/macOS/CmuxNext/Sources/CmuxNextDesign/WindowBackdrop.swift @@ -27,8 +27,8 @@ public nonisolated struct WindowBackdrop: Equatable, Sendable { public var art: BackdropArt? = nil /// Optional bundled or system image beneath the material. public var selection: BackdropSelection? = nil - /// The least tint over art at which every text role stays legible - /// (``ThemeTokens/legibleTintOpacity(over:requested:)``); 0 without art. Neither the opacity setting + /// The least tint over art at which the text the scope's ``ArtLegibility`` names stays legible + /// (``ThemeTokens/legibleTintOpacity(over:requested:legibility:)``); 0 without art. Neither the opacity setting /// nor the tuner thins the glass below it. public var legibleTintOpacity: Double = 0 /// The art's own opacity: 1, or ``windowGlassArtOpacity`` under Window Glass (the Clear Glass @@ -101,9 +101,11 @@ public nonisolated struct WindowBackdrop: Equatable, Sendable { /// - Parameter art: Bundled art below the window's material and tint. /// - Parameter tintOpacity: A workspace's own tint over art (`ThemeScope.backdropTintOpacity`), /// replacing the work's and the window's; the legibility floor still applies. + /// - Parameter legibility: The text the floor keeps readable over art (`ThemeScope.artLegibility`). public init(_ tokens: ThemeTokens, reduceTransparency: Bool = false, art: BackdropArt? = nil, selection: BackdropSelection? = nil, tuning: AppearanceTuning = .identity, - texture: BackdropTexture = .default, tintOpacity workspaceTint: Double? = nil) { + texture: BackdropTexture = .default, tintOpacity workspaceTint: Double? = nil, + legibility: ArtLegibility = .primary) { let resolvedSelection = selection ?? art.map(BackdropSelection.art) // A work's own tint replaces the theme's (dark works show more of themselves); the // legibility floor below still keeps text readable over it. @@ -123,7 +125,7 @@ public nonisolated struct WindowBackdrop: Equatable, Sendable { if windowGlass { artOpacity = Self.windowGlassArtOpacity } if resolvedSelection != nil, !isOpaque { let range = windowGlass ? .any : resolvedSelection?.artRange ?? .any - legibleTintOpacity = tokens.legibleTintOpacity(over: range, requested: 0) + legibleTintOpacity = tokens.legibleTintOpacity(over: range, requested: 0, legibility: legibility) tintOpacity = max(tintOpacity, legibleTintOpacity) } self.art = art diff --git a/Packages/macOS/CmuxNext/Sources/CmuxNextDesign/Windows/WindowSurfaceView.swift b/Packages/macOS/CmuxNext/Sources/CmuxNextDesign/Windows/WindowSurfaceView.swift index d6237a6fcec1..ef79e8694048 100644 --- a/Packages/macOS/CmuxNext/Sources/CmuxNextDesign/Windows/WindowSurfaceView.swift +++ b/Packages/macOS/CmuxNext/Sources/CmuxNextDesign/Windows/WindowSurfaceView.swift @@ -50,7 +50,7 @@ public final class WindowSurfaceView: NSView, WindowSurfacePainting { public func backdrop(in window: NSWindow) -> WindowBackdrop { WindowBackdrop(window.themeScope.tokens, reduceTransparency: reduceTransparency(), art: window.themeScope.backdropArt, selection: window.themeScope.backdropSelection, tuning: window.themeScope.appearanceTuning, - tintOpacity: window.themeScope.backdropTintOpacity) + tintOpacity: window.themeScope.backdropTintOpacity, legibility: window.themeScope.artLegibility) } public func paintWindowSurface(of window: NSWindow) { diff --git a/Packages/macOS/CmuxNext/Sources/CmuxNextSettings/CmuxConfigSnapshot.swift b/Packages/macOS/CmuxNext/Sources/CmuxNextSettings/CmuxConfigSnapshot.swift index 7cf0fba814f7..12f7c71731e0 100644 --- a/Packages/macOS/CmuxNext/Sources/CmuxNextSettings/CmuxConfigSnapshot.swift +++ b/Packages/macOS/CmuxNext/Sources/CmuxNextSettings/CmuxConfigSnapshot.swift @@ -121,6 +121,8 @@ public struct CmuxConfigSnapshot: Sendable, Equatable { public var backdropSelection: BackdropSelection? = BackdropSelectionSetting.defaultSelection /// `appearance.experimentalControls`; off unless explicitly enabled. public var experimentalAppearance = false + /// `appearance.glassLegibility`; "primary" when unset or invalid. + public var glassLegibility = GlassLegibilitySetting.fallback /// `appearance.glassTransparency`, `appearance.hue` and /// `appearance.saturation`; identity values when unset or invalid. public var appearanceTuning = AppearanceTuningSetting.fallback @@ -280,6 +282,7 @@ public struct CmuxConfigSnapshot: Sendable, Equatable { if case .art(let art) = snapshot.backdropSelection { snapshot.backdropArt = art } else { snapshot.backdropArt = nil } snapshot.experimentalAppearance = ExperimentalAppearanceSetting().parse(root, diagnostics: &snapshot.diagnostics) snapshot.appearanceTuning = AppearanceTuningSetting.parse(root, diagnostics: &snapshot.diagnostics) + snapshot.take(GlassLegibilitySetting().parse(root), \.glassLegibility) snapshot.statusIndicator = StatusIndicatorConfigParser.parse(root, diagnostics: &snapshot.diagnostics) DiffViewerSetting.parse(root, diagnostics: &snapshot.diagnostics) ChatSettings.validate(root, diagnostics: &snapshot.diagnostics) diff --git a/Packages/macOS/CmuxNext/Sources/CmuxNextSettings/GlassLegibilitySetting.swift b/Packages/macOS/CmuxNext/Sources/CmuxNextSettings/GlassLegibilitySetting.swift new file mode 100644 index 000000000000..43e03b8fc361 --- /dev/null +++ b/Packages/macOS/CmuxNext/Sources/CmuxNextSettings/GlassLegibilitySetting.swift @@ -0,0 +1,20 @@ +public import CmuxNextDesign + +/// `appearance.glassLegibility` in cmux.json: "primary" (default) or "all", the text the window's +/// glass keeps readable over background art (``ArtLegibility``). +public nonisolated struct GlassLegibilitySetting { + public nonisolated init() {} + public static let configPath = ["appearance", "glassLegibility"] + public static let fallback: ArtLegibility = .primary + + /// A missing key is the default with no diagnostic; a bad value is the default plus a diagnostic. + func parse(_ root: JSONValue) -> (ArtLegibility, SettingsDiagnostic?) { + guard let value = root.value(at: Self.configPath) else { return (Self.fallback, nil) } + guard let text = value.stringValue, let legibility = ArtLegibility(rawValue: text) else { + let choices = ArtLegibility.allCases.map { "\"\($0.rawValue)\"" }.joined(separator: ", ") + return (Self.fallback, SettingsDiagnostic(kind: .invalidValue, path: "appearance.glassLegibility", + message: "expected one of \(choices)")) + } + return (legibility, nil) + } +} diff --git a/Packages/macOS/CmuxNext/Sources/CmuxNextSettings/Localizable.xcstrings b/Packages/macOS/CmuxNext/Sources/CmuxNextSettings/Localizable.xcstrings index 2a57f970e24f..c2dd42e20a5b 100644 --- a/Packages/macOS/CmuxNext/Sources/CmuxNextSettings/Localizable.xcstrings +++ b/Packages/macOS/CmuxNext/Sources/CmuxNextSettings/Localizable.xcstrings @@ -1,6 +1,530 @@ { "sourceLanguage": "en", "strings": { + "settings.appearance.glassLegibility": { + "extractionState": "manual", + "localizations": { + "en": { + "stringUnit": { + "state": "translated", + "value": "Glass Over Art" + } + }, + "ar": { + "stringUnit": { + "state": "needs_review", + "value": "الزجاج فوق الصورة" + } + }, + "bs": { + "stringUnit": { + "state": "needs_review", + "value": "Staklo preko slike" + } + }, + "da": { + "stringUnit": { + "state": "needs_review", + "value": "Glas over kunst" + } + }, + "de": { + "stringUnit": { + "state": "needs_review", + "value": "Glas über Kunst" + } + }, + "es": { + "stringUnit": { + "state": "needs_review", + "value": "Cristal sobre el arte" + } + }, + "fr": { + "stringUnit": { + "state": "needs_review", + "value": "Verre sur l’œuvre" + } + }, + "it": { + "stringUnit": { + "state": "needs_review", + "value": "Vetro sull’opera" + } + }, + "ja": { + "stringUnit": { + "state": "needs_review", + "value": "アート上のガラス" + } + }, + "km": { + "stringUnit": { + "state": "needs_review", + "value": "កញ្ចក់លើរូបភាព" + } + }, + "ko": { + "stringUnit": { + "state": "needs_review", + "value": "아트 위 유리" + } + }, + "nb": { + "stringUnit": { + "state": "needs_review", + "value": "Glass over kunst" + } + }, + "pl": { + "stringUnit": { + "state": "needs_review", + "value": "Szkło nad obrazem" + } + }, + "pt-BR": { + "stringUnit": { + "state": "needs_review", + "value": "Vidro sobre a arte" + } + }, + "ru": { + "stringUnit": { + "state": "needs_review", + "value": "Стекло поверх изображения" + } + }, + "th": { + "stringUnit": { + "state": "needs_review", + "value": "กระจกบนภาพ" + } + }, + "tr": { + "stringUnit": { + "state": "needs_review", + "value": "Resim Üzerinde Cam" + } + }, + "uk": { + "stringUnit": { + "state": "needs_review", + "value": "Скло поверх зображення" + } + }, + "vi": { + "stringUnit": { + "state": "needs_review", + "value": "Kính trên ảnh nền" + } + }, + "zh-Hans": { + "stringUnit": { + "state": "needs_review", + "value": "图片上的玻璃" + } + }, + "zh-Hant": { + "stringUnit": { + "state": "needs_review", + "value": "圖片上的玻璃" + } + } + } + }, + "settings.appearance.glassLegibility.help": { + "extractionState": "manual", + "localizations": { + "en": { + "stringUnit": { + "state": "translated", + "value": "Main Text keeps primary text readable over any art and lets much more of the art through, like iOS. All Text also keeps secondary and dim text at full contrast, with denser glass." + } + }, + "ar": { + "stringUnit": { + "state": "needs_review", + "value": "«النص الرئيسي» يُبقي النص الأساسي مقروءًا فوق أي صورة ويُظهر الكثير منها، مثل iOS. «كل النص» يُبقي النص الثانوي والخافت بتباين كامل أيضًا، بزجاج أكثف." + } + }, + "bs": { + "stringUnit": { + "state": "needs_review", + "value": "Glavni tekst drži primarni tekst čitljivim preko bilo koje slike i propušta mnogo više slike, kao iOS. Sav tekst drži i sekundarni i prigušeni tekst u punom kontrastu, uz gušće staklo." + } + }, + "da": { + "stringUnit": { + "state": "needs_review", + "value": "Hovedtekst holder primær tekst læsbar over al kunst og lader langt mere af kunsten skinne igennem, som iOS. Al tekst holder også sekundær og dæmpet tekst i fuld kontrast med tættere glas." + } + }, + "de": { + "stringUnit": { + "state": "needs_review", + "value": "Haupttext hält primären Text über jedem Bild lesbar und lässt viel mehr vom Bild durch, wie iOS. Aller Text hält auch sekundären und gedämpften Text bei vollem Kontrast, mit dichterem Glas." + } + }, + "es": { + "stringUnit": { + "state": "needs_review", + "value": "Texto principal mantiene legible el texto principal sobre cualquier arte y deja ver mucho más de él, como iOS. Todo el texto mantiene también el texto secundario y tenue con contraste completo, con un cristal más denso." + } + }, + "fr": { + "stringUnit": { + "state": "needs_review", + "value": "Texte principal garde le texte principal lisible sur toute œuvre et laisse passer bien plus de l’œuvre, comme iOS. Tout le texte garde aussi le texte secondaire et atténué à plein contraste, avec un verre plus dense." + } + }, + "it": { + "stringUnit": { + "state": "needs_review", + "value": "Testo principale mantiene leggibile il testo principale su qualsiasi opera e lascia passare molto più dell’opera, come iOS. Tutto il testo mantiene anche il testo secondario e attenuato a pieno contrasto, con un vetro più denso." + } + }, + "ja": { + "stringUnit": { + "state": "needs_review", + "value": "「メインテキスト」はどのアートの上でも主要なテキストを読みやすく保ち、iOS のようにアートをより多く透かします。「すべてのテキスト」は補助テキストや淡いテキストも完全なコントラストに保ち、ガラスが濃くなります。" + } + }, + "km": { + "stringUnit": { + "state": "needs_review", + "value": "អត្ថបទមេ រក្សាអត្ថបទចម្បងឱ្យអានបានលើរូបភាពណាមួយ ហើយបង្ហាញរូបភាពច្រើនជាងមុន ដូច iOS។ អត្ថបទទាំងអស់ រក្សាអត្ថបទបន្ទាប់បន្សំ និងអត្ថបទស្រាលក្នុងកម្រិតពន្លឺពេញលេញផងដែរ ជាមួយកញ្ចក់ក្រាស់ជាង។" + } + }, + "ko": { + "stringUnit": { + "state": "needs_review", + "value": "주요 텍스트는 어떤 아트 위에서도 기본 텍스트를 읽기 쉽게 유지하고 iOS처럼 아트를 훨씬 더 많이 비춥니다. 모든 텍스트는 보조 텍스트와 흐린 텍스트도 완전한 대비로 유지하며 유리가 더 짙어집니다." + } + }, + "nb": { + "stringUnit": { + "state": "needs_review", + "value": "Hovedtekst holder primærtekst lesbar over all kunst og slipper mye mer av kunsten gjennom, som iOS. All tekst holder også sekundær og dempet tekst i full kontrast, med tettere glass." + } + }, + "pl": { + "stringUnit": { + "state": "needs_review", + "value": "Główny tekst utrzymuje czytelność tekstu podstawowego nad każdym obrazem i przepuszcza znacznie więcej obrazu, jak w iOS. Cały tekst utrzymuje też pełny kontrast tekstu pomocniczego i przygaszonego, przy gęstszym szkle." + } + }, + "pt-BR": { + "stringUnit": { + "state": "needs_review", + "value": "Texto principal mantém o texto principal legível sobre qualquer arte e deixa passar muito mais dela, como no iOS. Todo o texto também mantém o texto secundário e esmaecido com contraste total, com um vidro mais denso." + } + }, + "ru": { + "stringUnit": { + "state": "needs_review", + "value": "«Основной текст» сохраняет читаемость основного текста поверх любого изображения и пропускает гораздо больше изображения, как в iOS. «Весь текст» также сохраняет полный контраст второстепенного и приглушённого текста, а стекло становится плотнее." + } + }, + "th": { + "stringUnit": { + "state": "needs_review", + "value": "ข้อความหลักทำให้ข้อความหลักอ่านได้บนภาพใดก็ได้ และให้เห็นภาพมากขึ้นมาก เหมือน iOS ข้อความทั้งหมดทำให้ข้อความรองและข้อความจางมีคอนทราสต์เต็มที่ด้วย โดยกระจกจะทึบขึ้น" + } + }, + "tr": { + "stringUnit": { + "state": "needs_review", + "value": "Ana Metin, birincil metni her resmin üzerinde okunur tutar ve iOS gibi resmin çok daha fazlasını gösterir. Tüm Metin, ikincil ve soluk metni de tam kontrastta tutar; cam daha yoğun olur." + } + }, + "uk": { + "stringUnit": { + "state": "needs_review", + "value": "«Основний текст» зберігає читабельність основного тексту поверх будь-якого зображення й пропускає значно більше зображення, як в iOS. «Увесь текст» також зберігає повний контраст другорядного й приглушеного тексту, а скло стає щільнішим." + } + }, + "vi": { + "stringUnit": { + "state": "needs_review", + "value": "Văn bản chính giữ văn bản chính dễ đọc trên mọi ảnh nền và để lộ nhiều ảnh hơn hẳn, như iOS. Toàn bộ văn bản cũng giữ văn bản phụ và văn bản mờ ở độ tương phản đầy đủ, với lớp kính dày hơn." + } + }, + "zh-Hans": { + "stringUnit": { + "state": "needs_review", + "value": "“主要文本”让主要文本在任何图片上都清晰可读,并像 iOS 一样透出更多图片。“全部文本”还让次要和暗淡文本保持完整对比度,玻璃会更浓。" + } + }, + "zh-Hant": { + "stringUnit": { + "state": "needs_review", + "value": "「主要文字」讓主要文字在任何圖片上都清晰可讀,並像 iOS 一樣透出更多圖片。「全部文字」也讓次要和暗淡文字保持完整對比度,玻璃會更濃。" + } + } + } + }, + "settings.choice.glassLegibility.primary": { + "extractionState": "manual", + "localizations": { + "en": { + "stringUnit": { + "state": "translated", + "value": "Main Text" + } + }, + "ar": { + "stringUnit": { + "state": "needs_review", + "value": "النص الرئيسي" + } + }, + "bs": { + "stringUnit": { + "state": "needs_review", + "value": "Glavni tekst" + } + }, + "da": { + "stringUnit": { + "state": "needs_review", + "value": "Hovedtekst" + } + }, + "de": { + "stringUnit": { + "state": "needs_review", + "value": "Haupttext" + } + }, + "es": { + "stringUnit": { + "state": "needs_review", + "value": "Texto principal" + } + }, + "fr": { + "stringUnit": { + "state": "needs_review", + "value": "Texte principal" + } + }, + "it": { + "stringUnit": { + "state": "needs_review", + "value": "Testo principale" + } + }, + "ja": { + "stringUnit": { + "state": "needs_review", + "value": "メインテキスト" + } + }, + "km": { + "stringUnit": { + "state": "needs_review", + "value": "អត្ថបទមេ" + } + }, + "ko": { + "stringUnit": { + "state": "needs_review", + "value": "주요 텍스트" + } + }, + "nb": { + "stringUnit": { + "state": "needs_review", + "value": "Hovedtekst" + } + }, + "pl": { + "stringUnit": { + "state": "needs_review", + "value": "Główny tekst" + } + }, + "pt-BR": { + "stringUnit": { + "state": "needs_review", + "value": "Texto principal" + } + }, + "ru": { + "stringUnit": { + "state": "needs_review", + "value": "Основной текст" + } + }, + "th": { + "stringUnit": { + "state": "needs_review", + "value": "ข้อความหลัก" + } + }, + "tr": { + "stringUnit": { + "state": "needs_review", + "value": "Ana Metin" + } + }, + "uk": { + "stringUnit": { + "state": "needs_review", + "value": "Основний текст" + } + }, + "vi": { + "stringUnit": { + "state": "needs_review", + "value": "Văn bản chính" + } + }, + "zh-Hans": { + "stringUnit": { + "state": "needs_review", + "value": "主要文本" + } + }, + "zh-Hant": { + "stringUnit": { + "state": "needs_review", + "value": "主要文字" + } + } + } + }, + "settings.choice.glassLegibility.all": { + "extractionState": "manual", + "localizations": { + "en": { + "stringUnit": { + "state": "translated", + "value": "All Text" + } + }, + "ar": { + "stringUnit": { + "state": "needs_review", + "value": "كل النص" + } + }, + "bs": { + "stringUnit": { + "state": "needs_review", + "value": "Sav tekst" + } + }, + "da": { + "stringUnit": { + "state": "needs_review", + "value": "Al tekst" + } + }, + "de": { + "stringUnit": { + "state": "needs_review", + "value": "Aller Text" + } + }, + "es": { + "stringUnit": { + "state": "needs_review", + "value": "Todo el texto" + } + }, + "fr": { + "stringUnit": { + "state": "needs_review", + "value": "Tout le texte" + } + }, + "it": { + "stringUnit": { + "state": "needs_review", + "value": "Tutto il testo" + } + }, + "ja": { + "stringUnit": { + "state": "needs_review", + "value": "すべてのテキスト" + } + }, + "km": { + "stringUnit": { + "state": "needs_review", + "value": "អត្ថបទទាំងអស់" + } + }, + "ko": { + "stringUnit": { + "state": "needs_review", + "value": "모든 텍스트" + } + }, + "nb": { + "stringUnit": { + "state": "needs_review", + "value": "All tekst" + } + }, + "pl": { + "stringUnit": { + "state": "needs_review", + "value": "Cały tekst" + } + }, + "pt-BR": { + "stringUnit": { + "state": "needs_review", + "value": "Todo o texto" + } + }, + "ru": { + "stringUnit": { + "state": "needs_review", + "value": "Весь текст" + } + }, + "th": { + "stringUnit": { + "state": "needs_review", + "value": "ข้อความทั้งหมด" + } + }, + "tr": { + "stringUnit": { + "state": "needs_review", + "value": "Tüm Metin" + } + }, + "uk": { + "stringUnit": { + "state": "needs_review", + "value": "Увесь текст" + } + }, + "vi": { + "stringUnit": { + "state": "needs_review", + "value": "Toàn bộ văn bản" + } + }, + "zh-Hans": { + "stringUnit": { + "state": "needs_review", + "value": "全部文本" + } + }, + "zh-Hant": { + "stringUnit": { + "state": "needs_review", + "value": "全部文字" + } + } + } + }, "settings.group.chiefChat": { "comment": "Settings group in Agents: how the Chief chat looks.", "extractionState": "manual", diff --git a/Packages/macOS/CmuxNext/Sources/CmuxNextSettings/Schema/SettingsSchema+AgentPolicy.swift b/Packages/macOS/CmuxNext/Sources/CmuxNextSettings/Schema/SettingsSchema+AgentPolicy.swift index d83a49fafe8e..4e0518f01c52 100644 --- a/Packages/macOS/CmuxNext/Sources/CmuxNextSettings/Schema/SettingsSchema+AgentPolicy.swift +++ b/Packages/macOS/CmuxNext/Sources/CmuxNextSettings/Schema/SettingsSchema+AgentPolicy.swift @@ -85,6 +85,7 @@ extension SettingsSchema { "appearance.themeEdits", "appearance.backdropArt", "appearance.backgroundOpacity", + "appearance.glassLegibility", "appearance.backgroundBlur", "appearance.background", "appearance.experimentalControls", diff --git a/Packages/macOS/CmuxNext/Sources/CmuxNextSettings/Schema/SettingsSchema+Appearance.swift b/Packages/macOS/CmuxNext/Sources/CmuxNextSettings/Schema/SettingsSchema+Appearance.swift index 1910c0957961..d7e561e6c67d 100644 --- a/Packages/macOS/CmuxNext/Sources/CmuxNextSettings/Schema/SettingsSchema+Appearance.swift +++ b/Packages/macOS/CmuxNext/Sources/CmuxNextSettings/Schema/SettingsSchema+Appearance.swift @@ -104,6 +104,18 @@ nonisolated enum AppearanceSettingsSchema { default: nil, defaultLabel: ghostty, keywords: ["transparency", "translucent", "background-opacity", "blur", "glass"] ), + SettingDescriptor( + GlassLegibilitySetting.configPath, section: .appearance, group: window, + title: SettingsText.keyed("settings.appearance.glassLegibility", "Glass Over Art"), + help: SettingsText.keyed("settings.appearance.glassLegibility.help", + "Main Text keeps primary text readable over any art and lets much more of the art through, like iOS. All Text also keeps secondary and dim text at full contrast, with denser glass."), + kind: .choice([ + SettingChoice(ArtLegibility.primary.rawValue, SettingsText.keyed("settings.choice.glassLegibility.primary", "Main Text")), + SettingChoice(ArtLegibility.all.rawValue, SettingsText.keyed("settings.choice.glassLegibility.all", "All Text")), + ]), + default: .string(GlassLegibilitySetting.fallback.rawValue), + keywords: ["glass", "legibility", "contrast", "readable", "art", "wallpaper", "transparency", "ios"] + ), SettingDescriptor( WindowBackgroundSetting.materialPath, section: .appearance, group: window, title: SettingsText.keyed("settings.appearance.backgroundBlur", "Material"), diff --git a/Packages/macOS/CmuxNext/Sources/CmuxNextSettings/SettingsApplier.swift b/Packages/macOS/CmuxNext/Sources/CmuxNextSettings/SettingsApplier.swift index 5d38fa2036e6..e0f51b59f18e 100644 --- a/Packages/macOS/CmuxNext/Sources/CmuxNextSettings/SettingsApplier.swift +++ b/Packages/macOS/CmuxNext/Sources/CmuxNextSettings/SettingsApplier.swift @@ -47,6 +47,7 @@ public final class SettingsApplier { if design.enabledAnimations != snapshot.animationKinds.enabled { design.enabledAnimations = snapshot.animationKinds.enabled } if design.animationBounce != snapshot.animationKinds.bounce { design.animationBounce = snapshot.animationKinds.bounce } if design.paneAnimations != snapshot.paneAnimations { design.paneAnimations = snapshot.paneAnimations } + ThemeScope.app.setArtLegibility(snapshot.glassLegibility) if design.classicHome != snapshot.classicHome { design.classicHome = snapshot.classicHome } if design.homeChannelsEnabled != snapshot.homeChannelsEnabled { design.homeChannelsEnabled = snapshot.homeChannelsEnabled } let chiefBubblesThemed = snapshot.homeChiefBubbleStyle == HomeChiefBubbleStyleSetting.theme diff --git a/Packages/macOS/CmuxNext/Sources/CmuxNextTerminal/TerminalHostView.swift b/Packages/macOS/CmuxNext/Sources/CmuxNextTerminal/TerminalHostView.swift index 28f86aba763c..b714f4ec5c37 100644 --- a/Packages/macOS/CmuxNext/Sources/CmuxNextTerminal/TerminalHostView.swift +++ b/Packages/macOS/CmuxNext/Sources/CmuxNextTerminal/TerminalHostView.swift @@ -292,7 +292,8 @@ public final class TerminalHostView: NSView { let (scope, tokens) = (themeScope, themeTokens) // The window root's backdrop (`WindowRootView.backdrop`): the scope's art and its own tint. let backdrop = WindowBackdrop(tokens, reduceTransparency: ReduceTransparency.shared.isEnabled, - selection: scope.backdropSelection, tintOpacity: scope.backdropTintOpacity) + selection: scope.backdropSelection, tintOpacity: scope.backdropTintOpacity, + legibility: scope.artLegibility) GhosttyRuntime.setSeeThrough(superview != nil && !backdrop.panesPaintBackground, host: self) let fill = performWithTheme { Palette.surfaceOverride(.terminal) } if let fill { diff --git a/Packages/macOS/CmuxNext/Tests/CmuxNextAppTests/GlassLegibilityTests.swift b/Packages/macOS/CmuxNext/Tests/CmuxNextAppTests/GlassLegibilityTests.swift new file mode 100644 index 000000000000..05db98459277 --- /dev/null +++ b/Packages/macOS/CmuxNext/Tests/CmuxNextAppTests/GlassLegibilityTests.swift @@ -0,0 +1,66 @@ +@testable import CmuxNextDesign +import Foundation +import Testing + +/// Glass Over Art (`appearance.glassLegibility`): by default the glass keeps only primary text at +/// WCAG AA over the art, like iOS, so far more of the art shows; "all" keeps every text role at +/// its contrast, the denser glass cmux had before. +@MainActor @Suite struct GlassLegibilityTests { + static let work = BackdropSelection.art(.hokusaiGreatWave) + + @Test func mainTextShowsMoreArtAndKeepsPrimaryTextReadable() throws { + for input in [ThemeInput.ghosttyDefault] { + let tokens = ThemeTokens.derive(from: input) + let range = try #require(Self.work.artRange) + let primary = tokens.legibleTintOpacity(over: range, requested: 0, legibility: .primary) + let all = tokens.legibleTintOpacity(over: range, requested: 0, legibility: .all) + #expect(primary < all) + // Primary text still holds AA over the work's darkest and lightest colors. + #expect(range.isLegible(texts: tokens.backdropTexts(.primary), scrim: tokens.surfaceBackground.withAlpha(1), + opacity: primary)) + } + } + + @Test func allTextHoldsEveryRoleAtItsContrast() throws { + let tokens = ThemeTokens.derive(from: .ghosttyDefault) + let range = try #require(Self.work.artRange) + let all = tokens.legibleTintOpacity(over: range, requested: 0, legibility: .all) + #expect(range.isLegible(texts: tokens.backdropTexts(.all), scrim: tokens.surfaceBackground.withAlpha(1), opacity: all)) + #expect(tokens.backdropTexts(.all).count == 3) + #expect(tokens.backdropTexts(.primary).count == 1) + } + + /// The window's own backdrop takes the floor the scope's choice names: "all" is denser glass. + @Test func theBackdropFloorFollowsTheChoice() { + let tokens = ThemeTokens.derive(from: .ghosttyDefault) + let primary = WindowBackdrop(tokens, selection: Self.work, legibility: .primary) + let all = WindowBackdrop(tokens, selection: Self.work, legibility: .all) + #expect(primary.legibleTintOpacity < all.legibleTintOpacity) + #expect(all.tintOpacity >= all.legibleTintOpacity) + } + + /// The choice is set on a scope and inherited by its descendants, like art. + @Test func descendantsInheritTheScopeChoice() { + let room = ThemeScope(level: .room) + let workspace = ThemeScope(level: .workspace, parent: room) + #expect(workspace.artLegibility == .primary) + room.setArtLegibility(.all) + #expect(workspace.artLegibility == .all) + room.setArtLegibility(.primary) + #expect(workspace.artLegibility == .primary) + } + + /// Settings' unset Opacity slider rests on the tint the window paints, so with "all" it sits + /// on the denser floor, not on the primary one. + @Test func theUnsetOpacitySliderFollowsTheChoice() { + let scope = ThemeScope(level: .room) + scope.setBackdropSelection(Self.work) + let primary = scope.shownWindowOpacity + scope.setArtLegibility(.all) + let painted = WindowBackdrop(scope.tokens, art: scope.backdropArt, selection: scope.backdropSelection, + tuning: scope.appearanceTuning, tintOpacity: scope.backdropTintOpacity, + legibility: .all) + #expect(scope.shownWindowOpacity == painted.tintOpacity) + #expect(scope.shownWindowOpacity > primary) + } +} diff --git a/Packages/macOS/CmuxNext/Tests/CmuxNextAppTests/WindowGlassTests.swift b/Packages/macOS/CmuxNext/Tests/CmuxNextAppTests/WindowGlassTests.swift index 24d761e27b5a..5d1fc1c1d9cb 100644 --- a/Packages/macOS/CmuxNext/Tests/CmuxNextAppTests/WindowGlassTests.swift +++ b/Packages/macOS/CmuxNext/Tests/CmuxNextAppTests/WindowGlassTests.swift @@ -20,7 +20,7 @@ import Testing #expect(glass.artOpacity == WindowBackdrop.windowGlassArtOpacity) #expect(glass.artOpacity < 1) // Whatever is behind the window shows through the art: the floor holds over any colors. - #expect(glass.legibleTintOpacity == tokens.legibleTintOpacity(over: .any, requested: 0)) + #expect(glass.legibleTintOpacity == tokens.legibleTintOpacity(over: .any, requested: 0, legibility: .primary)) #expect(glass.tintOpacity >= glass.legibleTintOpacity) } diff --git a/Packages/macOS/CmuxNext/Tests/CmuxNextSettingsTests/GlassLegibilitySettingTests.swift b/Packages/macOS/CmuxNext/Tests/CmuxNextSettingsTests/GlassLegibilitySettingTests.swift new file mode 100644 index 000000000000..950054df6940 --- /dev/null +++ b/Packages/macOS/CmuxNext/Tests/CmuxNextSettingsTests/GlassLegibilitySettingTests.swift @@ -0,0 +1,21 @@ +import CmuxNextDesign +import CmuxNextSettings +import Testing + +/// `appearance.glassLegibility`: "primary" (Main Text, like iOS) unless the file says "all". +struct GlassLegibilitySettingTests { + @Test func mainTextByDefault() { + let snapshot = CmuxConfigSnapshot.parse(.object([:]), validDensities: [], validMetrics: []) + #expect(snapshot.glassLegibility == .primary) + #expect(SettingsSchema.descriptor(for: GlassLegibilitySetting.configPath) != nil) + } + + @Test func allTextFromTheFileAndABadValueFallsBack() { + let all = JSONValue.object(["appearance": .object(["glassLegibility": .string("all")])]) + #expect(CmuxConfigSnapshot.parse(all, validDensities: [], validMetrics: []).glassLegibility == .all) + let bad = JSONValue.object(["appearance": .object(["glassLegibility": .string("ios")])]) + let snapshot = CmuxConfigSnapshot.parse(bad, validDensities: [], validMetrics: []) + #expect(snapshot.glassLegibility == .primary) + #expect(snapshot.diagnostics.contains { $0.path == "appearance.glassLegibility" }) + } +} diff --git a/Packages/macOS/CmuxNext/ci-target-graph.json b/Packages/macOS/CmuxNext/ci-target-graph.json index ce4d16183480..5ee3a31f35aa 100644 --- a/Packages/macOS/CmuxNext/ci-target-graph.json +++ b/Packages/macOS/CmuxNext/ci-target-graph.json @@ -268,6 +268,7 @@ "CmuxNextDaemonRecovery", "CmuxNextDaemonService", "CmuxNextDiff", + "CmuxNextFeed", "CmuxNextFileGrid", "CmuxNextFloating", "CmuxNextFocus", diff --git a/docs/mdm/com.manaflow.cmux.json b/docs/mdm/com.manaflow.cmux.json index 14c1009178a5..73fffce8eac2 100644 --- a/docs/mdm/com.manaflow.cmux.json +++ b/docs/mdm/com.manaflow.cmux.json @@ -757,6 +757,16 @@ "title" : "Focused Pane", "type" : "string" }, + "appearance.glassLegibility" : { + "default" : "primary", + "description" : "Main Text keeps primary text readable over any art and lets much more of the art through, like iOS. All Text also keeps secondary and dim text at full contrast, with denser glass.", + "enum" : [ + "primary", + "all" + ], + "title" : "Glass Over Art", + "type" : "string" + }, "appearance.glassTransparency" : { "default" : 0, "description" : "How much of the desktop or wallpaper shows through the glass.", @@ -2050,6 +2060,16 @@ "title" : "Channels", "type" : "boolean" }, + "home.chiefBubbleStyle" : { + "default" : "imessage", + "description" : "iMessage shows your messages in blue and the Chief's in gray. Theme uses your theme's accent and surface colors.", + "enum" : [ + "imessage", + "theme" + ], + "title" : "Bubble Style", + "type" : "string" + }, "home.chiefPetEnabled" : { "default" : false, "description" : "A small Chief floats over every app and shows agent events above it. Drag it anywhere; click it to message the Chief or reply to a session.", @@ -2137,6 +2157,12 @@ "title" : "Dock Column Mode", "type" : "string" }, + "layout.focusPaneOnScroll" : { + "default" : true, + "description" : "Scrolling over a pane focuses it. Momentum and scrolling within a second of typing leave focus where it is.", + "title" : "Focus Pane on Scroll", + "type" : "boolean" + }, "layout.frameOrientation" : { "default" : "columnMajor", "description" : "layout.frameOrientation", @@ -2465,7 +2491,7 @@ "type" : "string" }, "notifications.dismissal" : { - "default" : "keystroke", + "default" : "focus", "description" : "notifications.dismissal", "enum" : [ "keystroke", diff --git a/docs/mdm/com.manaflow.cmux.plist b/docs/mdm/com.manaflow.cmux.plist index 5f0fd78ef98c..64396dd0882a 100644 --- a/docs/mdm/com.manaflow.cmux.plist +++ b/docs/mdm/com.manaflow.cmux.plist @@ -899,6 +899,18 @@ pfm_type boolean + + pfm_default + + pfm_description + Scrolling over a pane focuses it. Momentum and scrolling within a second of typing leave focus where it is. + pfm_name + layout.focusPaneOnScroll + pfm_title + Focus Pane on Scroll + pfm_type + boolean + pfm_default 200 @@ -1751,6 +1763,23 @@ pfm_type real + + pfm_default + primary + pfm_description + Main Text keeps primary text readable over any art and lets much more of the art through, like iOS. All Text also keeps secondary and dim text at full contrast, with denser glass. + pfm_name + appearance.glassLegibility + pfm_range_list + + primary + all + + pfm_title + Glass Over Art + pfm_type + string + pfm_description Unset, the window follows Ghostty's background-opacity and background-blur. @@ -5360,6 +5389,23 @@ pfm_type boolean + + pfm_default + imessage + pfm_description + iMessage shows your messages in blue and the Chief's in gray. Theme uses your theme's accent and surface colors. + pfm_name + home.chiefBubbleStyle + pfm_range_list + + imessage + theme + + pfm_title + Bubble Style + pfm_type + string + pfm_default @@ -5420,7 +5466,7 @@ pfm_default - keystroke + focus pfm_name notifications.dismissal pfm_range_list diff --git a/docs/mdm/managed-preferences.md b/docs/mdm/managed-preferences.md index 2ec41b5155cb..caab138f1f18 100644 --- a/docs/mdm/managed-preferences.md +++ b/docs/mdm/managed-preferences.md @@ -73,6 +73,7 @@ Files: `com.manaflow.cmux.plist` (ProfileManifests: iMazing Profile Editor, Prof | `layout.dockColumnMode` | string | `"docked"` | `docked`, `overlay` | Dock Column Mode | | `layout.frameOrientation` | string | `"columnMajor"` | `columnMajor`, `rowMajor` | Dock Corners | | `layout.rows` | boolean | `true` | | Rows. Off hides New Row and fits a column's existing rows into it without scrolling. | +| `layout.focusPaneOnScroll` | boolean | `true` | | Focus Pane on Scroll. Scrolling over a pane focuses it. Momentum and scrolling within a second of typing leave focus where it is. | | `layout.minimumPaneWidth` | real | `200` | 80 to 800 | Minimum Pane Width | | `layout.minimumPaneHeight` | real | `64` | 32 to 600 | Minimum Pane Height | | `layout.newPanePlacement` | string | `"tab"` | `tab`, `split` | New Terminals and Browsers. Open a Tab adds a tab to the focused pane. Split Automatically splits the largest pane, like New Pane (Auto Layout). | @@ -100,6 +101,7 @@ Files: `com.manaflow.cmux.plist` (ProfileManifests: iMazing Profile Editor, Prof | `appearance.background` | string | `"none"` | `none`, `daily`, `david-death-of-marat`, `goya-saturn`, `velde-small-ship-storm`, `bosch-garden-right`, `bosch-ascent-blessed`, `goya-witches-flight`, `bocklin-self-portrait-death`, `caravaggio-medusa`, `martin-pandemonium`, `moran-burning-philadelphia`, `goya-burial-sardine`, `arbo-wild-hunt`, `caravaggio-david-goliath`, `van-gogh-skeleton-cigarette`, `altdorfer-battle-of-issus`, `gentileschi-judith`, `munch-madonna`, `bocklin-isle-of-the-dead`, `klee-fish-magic`, `friedrich-forest-moonlight`, `goya-witches-sabbath`, `bosch-garden-left`, `rembrandt-storm-galilee`, `cole-voyage-manhood`, `fuseli-nightmare-2`, `hiremy-hirschl-souls-of-acheron`, `munch-scream`, `klimt-judith`, `repin-ivan`, `millais-ophelia`, `bruegel-fall-rebel-angels`, `fuseli-nightmare`, `bundy-death-general`, `wright-vesuvius`, `gerome-botsaris`, `durer-knight-death-devil`, `martin-joshua`, `velde-gale`, `hogai-nio`, `klimt-death-and-life`, `klimt-medicine`, `bosch-garden-central`, `martin-great-day-wrath`, `bonheur-wounded-eagle`, `gerome-pollice-verso`, `cole-voyage-old-age`, `friedrich-abbey-oakwood`, `goya-sleep-of-reason`, `bosch-garden-fragment`, `bruegel-triumph-death`, `spilliaert-vertigo`, `rothaug-melpomene`, `schiele-death-and-the-maiden`, `aivazovsky-ship-stormy-seas`, `vereshchagin-apotheosis-war`, `ensor-skeleton-painter`, `cabanel-fallen-angel`, `spilliaert-woman-shoreline`, `el-greco-view-of-toledo`, `gericault-raft-of-the-medusa`, `moreau-apparition`, `rembrandt-prodigal-son`, `velazquez-las-meninas`, `matejko-stanczyk`, `sargent-madame-x`, `millais-joan-of-arc`, `cot-storm`, `rembrandt-night-watch`, `vigee-lebrun-madame-grand`, `waterhouse-lady-shalott`, `draper-lament-icarus`, `fragonard-swing`, `rubens-st-francis-xavier`, `vermeer-pearl-earring`, `danielson-gambogi-self`, `beard-his-majesty`, `marc-foxes`, `degas-green-dancers`, `modigliani-nude-divan`, `raphael-sistine-madonna`, `bouguereau-virgin-lilies`, `wood-american-gothic`, `steinlen-chat-noir`, `degas-blue-dancers`, `botticelli-primavera`, `van-gogh-cafe-terrace`, `matisse-red-room`, `kandinsky-deepened-impulse`, `friedrich-wanderer`, `klimt-adele`, `mucha-job`, `van-gogh-starry-night`, `klimt-tree-of-life`, `klimt-the-kiss`, `van-gogh-starry-night-rhone`, `delacroix-liberty`, `van-gogh-sunflowers`, `klimt-mada-primavesi`, `schiele-kneeling-orange`, `van-gogh-sunflowers-munich`, `michelangelo-sistine-ceiling`, `mondrian-composition-red-plane`, `lemoyne-apotheosis-hercules`, `schiele-moa`, `aivazovsky-ninth-wave`, `popova-painterly-architectonic`, `bruegel-tower-babel`, `botticelli-birth-of-venus`, `kandinsky-yellow-red-blue`, `kandinsky-composition-viii`, `kramskoi-unknown-woman`, `michelangelo-creation-of-adam`, `hokusai-great-wave`, `holbein-ambassadors`, `brueghel-wooden-vessel`, `dahl-dresden-moonlight`, `bosschaert-wan-li-vase`, `cot-springtime`, `ruysch-flowers`, `van-gogh-flowering-plum`, `toulmouche-reluctant-bride`, `rosso-musical-angel`, `grimshaw-blackman-street`, `waterhouse-ophelia`, `biard-magdalena-bay`, `renoir-vase-roses`, `roerich-himalayas`, `velde-close-hauled`, `sohlberg-flower-meadow`, `dahl-cloud-study`, `friedrich-two-men-moon`, `monet-waterlily-pond`, `hesselbom-dusk`, `toulmouche-vanity`, `hiroshige-zoshigaya`, `monet-water-lilies`, `monet-water-lilies-1907`, `bierstadt-storm-rockies`, `korovin-place-opera`, `klimt-garden-sunflowers`, `redon-butterflies`, `aivazovsky-winter-landscape`, `aivazovsky-along-coast`, `grimshaw-silver-moonlight`, `monet-water-lilies-setting-sun`, `hiroshige-hota-coast`, `durer-praying-hands`, `cole-voyage-childhood`, `monet-impression-sunrise`, `monet-woman-parasol`, `velde-cannon-shot`, `cross-pink-cloud`, `laurence-mckinley`, `van-gogh-irises`, `kramskoi-christ-in-the-desert`, `turner-temeraire`, `leonardo-vitruvian-man`, `bruegel-hunters-snow`, `cole-voyage-youth`, `friedrich-monk-by-the-sea`, `van-gogh-wheat-field-cypresses`, `monet-cliff-pourville`, `van-gogh-almond-blossom`, `van-gogh-fishing-boats`, `hokusai-umezawa`, `whistler-falling-rocket`, `dore-fall-of-satan`, `dore-flood`, `dore-wolves-sheep`, `dore-leviathan`, `dore-paradise-lost-book-vi`, `dore-moses-tables`, `dore-empyrean`, `dore-raven`, `desktop` | Background. Choose a public-domain painting, your desktop wallpaper, or a macOS system wallpaper behind the window material. | | `appearance.experimentalControls` | boolean | `false` | | Experimental Appearance Controls. Show the wallpaper grid and live appearance tuner while they are being integrated. | | `appearance.backgroundOpacity` | real | | 0 to 1 | Opacity. How much of the theme color covers the material behind the window. | +| `appearance.glassLegibility` | string | `"primary"` | `primary`, `all` | Glass Over Art. Main Text keeps primary text readable over any art and lets much more of the art through, like iOS. All Text also keeps secondary and dim text at full contrast, with denser glass. | | `appearance.backgroundBlur` | string | | `frosted`, `glass`, `glass-clear`, `none` | Material. Unset, the window follows Ghostty's background-opacity and background-blur. | | `appearance.glassTransparency` | real | `0` | 0 to 1 | Glass Transparency. How much of the desktop or wallpaper shows through the glass. | | `appearance.hue` | real | `0.5` | 0 to 1 | Hue. Shift the tint color around the hue wheel. | @@ -381,11 +383,12 @@ Files: `com.manaflow.cmux.plist` (ProfileManifests: iMazing Profile Editor, Prof | `browser.passwords.generate` | boolean | `true` | | Suggest Strong Passwords. Offers a generated password when a site asks for a new one, and saves it. | | `browser.passwords.allowExport` | boolean | `false` | | Allow Password Export. Lets the Passwords page write every saved password to a plain-text CSV file, after you confirm with Touch ID or your password. | | `browser.verificationAutofill.enabled` | boolean | `false` | | Fill Codes from Verification Emails. When a site emails you a code or link, its tab offers it. Only on the sender's own site, never filled without your click, and never stored. | +| `home.chiefBubbleStyle` | string | `"imessage"` | `imessage`, `theme` | Bubble Style. iMessage shows your messages in blue and the Chief's in gray. Theme uses your theme's accent and surface colors. | | `home.attachments.keepLocation` | boolean | `false` | | Keep Location in Photos and Videos. When off, location data is removed from photos and videos before they are attached. | | `home.channelsEnabled` | boolean | `false` | | Channels. Show Channels below Home in the sidebar. You can also turn it on or off from the command palette. | | `home.chiefPetEnabled` | boolean | `false` | | Show Chief Pet. A small Chief floats over every app and shows agent events above it. Drag it anywhere; click it to message the Chief or reply to a session. | | `home.chiefPetMascot` | string | `"orb"` | `orb`, `orb-spark`, `orb-hood`, `machine`, `machine-cyan`, `machine-blue`, `moon`, `moon-blue`, `fox` | Character | -| `notifications.dismissal` | string | `"keystroke"` | `keystroke`, `click`, `focus`, `explicit`, `timeout`, `never` | Clear Notification When | +| `notifications.dismissal` | string | `"focus"` | `keystroke`, `click`, `focus`, `explicit`, `timeout`, `never` | Clear Notification When | | `notifications.timeoutSeconds` | real | `30` | 1 to 86400 | Timeout. Used when a source clears after a timeout. | | `notifications.sources.agent.dismissal` | string | | `keystroke`, `click`, `focus`, `explicit`, `timeout`, `never` | Agents | | `notifications.sources.terminal.dismissal` | string | | `keystroke`, `click`, `focus`, `explicit`, `timeout`, `never` | Terminal Programs | diff --git a/schemas/defaults/cmux-next.json b/schemas/defaults/cmux-next.json index bcabc1568c43..7e929bb616b9 100644 --- a/schemas/defaults/cmux-next.json +++ b/schemas/defaults/cmux-next.json @@ -265,6 +265,7 @@ "setting.appearance.density": "compact", "setting.appearance.experimentalControls": false, "setting.appearance.focusIndicator": "tabs", + "setting.appearance.glassLegibility": "primary", "setting.appearance.glassTransparency": 0, "setting.appearance.hue": 0.5, "setting.appearance.interfaceScale": null, @@ -439,6 +440,7 @@ "setting.history.terminalCommands": false, "setting.home.attachments.keepLocation": false, "setting.home.channelsEnabled": false, + "setting.home.chiefBubbleStyle": "imessage", "setting.home.chiefPetEnabled": false, "setting.home.chiefPetMascot": "orb", "setting.labs.classicHome": false, @@ -449,6 +451,7 @@ "setting.layout.defaultColumnWidth": 0.5, "setting.layout.dockColumnEdge": "nearest", "setting.layout.dockColumnMode": "docked", + "setting.layout.focusPaneOnScroll": true, "setting.layout.frameOrientation": "columnMajor", "setting.layout.minimumPaneHeight": 64, "setting.layout.minimumPaneWidth": 200, @@ -488,7 +491,7 @@ "setting.notifications.attention.style": "blink", "setting.notifications.attention.width": 2, "setting.notifications.desktop": "unlessFocused", - "setting.notifications.dismissal": "keystroke", + "setting.notifications.dismissal": "focus", "setting.notifications.dockBadge": true, "setting.notifications.dockBounce": "once", "setting.notifications.mutedWorkspaces": [], diff --git a/schemas/settings-export/settings-schema.sources.sha256 b/schemas/settings-export/settings-schema.sources.sha256 index a0caa3665bbc..217cc720eb5d 100644 --- a/schemas/settings-export/settings-schema.sources.sha256 +++ b/schemas/settings-export/settings-schema.sources.sha256 @@ -100,11 +100,11 @@ cff26dd51f8b6d7c2f4b4c38f228f895c5d80b2e192f8ff4192e346f06a2e94a Packages/macOS 5cefeeca69c1e55286af8c8c492c53ef32d11a8e5c37f79bb0893cd6a2641109 Packages/macOS/CmuxNext/Sources/CmuxNextSettings/CmuxConfigSnapshot+Shortcuts.swift -afc0943e8760de0ee3b24c7fd7ccd5148ea043bc57bc827ea6ea0fac91892de2 Packages/macOS/CmuxNext/Sources/CmuxNextSettings/CmuxConfigSnapshot.swift +b82d4cd16390f256fa26e2a7673c5069940e589a99959248ea976c8ca1f6981c Packages/macOS/CmuxNext/Sources/CmuxNextSettings/CmuxConfigSnapshot.swift 6fb2ce5c119eb17ef80ce163deacdfbe5253ae35d88a0a0171f9cf419868fc31 Packages/macOS/CmuxNext/Sources/CmuxNextSettings/ColorTransitionSetting.swift -f1ff7f4d1c4c615d8922b39a5aa9f80f608921c7b8fadcfaeec598e22a273200 Packages/macOS/CmuxNext/Sources/CmuxNextSettings/ColumnLayoutSettings.swift +50608e1157bec85aa83559f71c3c902449f0eb308e277911bfa278b24ecc2e66 Packages/macOS/CmuxNext/Sources/CmuxNextSettings/ColumnLayoutSettings.swift 6787cdb70444f738a09abf4b6a00ef836c04d96c009e1e48eb4fffe050a3e394 Packages/macOS/CmuxNext/Sources/CmuxNextSettings/ComputerUseSettings.swift @@ -138,10 +138,14 @@ d3469cbe943484eaf4c7f0d7fd28f37518653f18568ebeb8e121bec3e67f3d3b Packages/macOS 44836f644ed2b6a491c8cf180b188da65ff587f06fbf9659f371214de8ef913c Packages/macOS/CmuxNext/Sources/CmuxNextSettings/FreeModelSettings.swift +3d737bf5c76f1afd1faa174408471251fa62e7db75f585f839797100beddf029 Packages/macOS/CmuxNext/Sources/CmuxNextSettings/GlassLegibilitySetting.swift + e774bf33b3a64a7cab27d31edf68ffbd0acb5cd5e2a881dc12c801d5f314402b Packages/macOS/CmuxNext/Sources/CmuxNextSettings/GlobalHotKeySetting.swift 478f8061a3f0dba8f9c45735f9b225e6ff5c449f4997c80503d994acb63c580b Packages/macOS/CmuxNext/Sources/CmuxNextSettings/HomeChannelsSetting.swift +b91146520ff2f02051e0aff15667608044b5a390f44b0c8f9842e249b7f1b337 Packages/macOS/CmuxNext/Sources/CmuxNextSettings/HomeChiefBubbleStyleSetting.swift + f8afa62608f725969719a3dc705b57752369cd83426cbab0f21cc640941a7b0e Packages/macOS/CmuxNext/Sources/CmuxNextSettings/HomeChiefPetSetting.swift 289d06d409505ee7e35631bf8c8c44f8e759b3e4ee2d537b9937075c605d9ba8 Packages/macOS/CmuxNext/Sources/CmuxNextSettings/HomeKeepLocationSetting.swift @@ -172,7 +176,7 @@ f6190cfeca4fa8b6e7a8fc495646e4f1febdbf801e79cac5030ae811aa5e28c1 Packages/macOS 69d7e7fe1d80c27c5ca44664c5b145d3151b9f3374f7c1885d8d66168c2ffdf4 Packages/macOS/CmuxNext/Sources/CmuxNextSettings/LinkRules/BrowserExternalURLWildcardToken.swift -2e67f2acf5ed78fc77a644cbe02ca7006a12e7c33bf0c2e79888d0f202c9b58d Packages/macOS/CmuxNext/Sources/CmuxNextSettings/Localizable.xcstrings +57c294cc5589e52c1be56436ce8ed8ae14a88d3e128a1d985cc427e62c15b7a9 Packages/macOS/CmuxNext/Sources/CmuxNextSettings/Localizable.xcstrings 29a18274e74e9f3a66f2462bc309275e30aa26214cfae878ece123115eeac587 Packages/macOS/CmuxNext/Sources/CmuxNextSettings/Managed/EffectiveSettings+Chats.swift @@ -212,11 +216,11 @@ abf3127556a9de512a7e2858c7b56811b336dd991aa01789ea2dcf7ec1190e35 Packages/macOS 4448d64ec314c406588edc6620c5c4afaa33fa6a43273fbbdb1014f415881e16 Packages/macOS/CmuxNext/Sources/CmuxNextSettings/NotificationConfigParser.swift -a30e00607618247fdf98f86c9d7859b53f976d380d03323960d7b140ba502eb1 Packages/macOS/CmuxNext/Sources/CmuxNextSettings/NotificationModes.swift +cbc06bcc1f9eb8df665ef9f6a308f709a50a2caaf156c88f01a93e11640cea0f Packages/macOS/CmuxNext/Sources/CmuxNextSettings/NotificationModes.swift 37e6fae5a0f758bda1d5322fae9b45e0a66404c6d49370fa4035c040427c5fda Packages/macOS/CmuxNext/Sources/CmuxNextSettings/NotificationPolicy.swift -d8c5c5b11035a6f5796428371961375641c7e66cd2e6735237b03339cd05b413 Packages/macOS/CmuxNext/Sources/CmuxNextSettings/NotificationPreferences.swift +b27c612ea41c047c639fd0b71f504d2cc80f860b42a516209c56c449916f3892 Packages/macOS/CmuxNext/Sources/CmuxNextSettings/NotificationPreferences.swift a9611156320b923ccd7504e408c9f327693312550f8b921d0e8d4d16178095d1 Packages/macOS/CmuxNext/Sources/CmuxNextSettings/NotificationSource.swift @@ -262,7 +266,7 @@ f988f030daf49836ae0a32c4e5e8e8578e70c7ec35e114542452ccce985bbfd7 Packages/macOS e36a5c327fb10a60497bdfebd32c71ca655869150d9d6adf0fd2142822d84a97 Packages/macOS/CmuxNext/Sources/CmuxNextSettings/Schema/EditorSettingsSchema.swift -18072ff8dcd1a234b422b247593dec0dd02c963d8d48f2f5008f6679d1946eb8 Packages/macOS/CmuxNext/Sources/CmuxNextSettings/Schema/HomeSettingsSchema.swift +bbb98624c18524d8dc39a6eff399c292cda2fba84df91063e281877b5d31c724 Packages/macOS/CmuxNext/Sources/CmuxNextSettings/Schema/HomeSettingsSchema.swift f0d08488fdb5361393bf7d6d8bd76d12ba3bdea7265784b1f5d7731fa2981f42 Packages/macOS/CmuxNext/Sources/CmuxNextSettings/Schema/LinkRoutingSchema.swift @@ -290,11 +294,11 @@ ea1a09694740863848c15a76d98f32e0bfe1b3a6d6ab47711beb665d8e2030b6 Packages/macOS 3df34a09959f7b325f9e8450944ee5d92410df990ed26b3a0ea09bd88f360b54 Packages/macOS/CmuxNext/Sources/CmuxNextSettings/Schema/SettingText.swift -83a737d014b3bcf65e0b0151bdae9aa5c5ffc36038dd6077e627f4bc677383b3 Packages/macOS/CmuxNext/Sources/CmuxNextSettings/Schema/SettingsPageLayout.swift +a970e95efb0dfa037ca5f3733ae8a79a4c7c82ee2781a539c0153332a90a25c6 Packages/macOS/CmuxNext/Sources/CmuxNextSettings/Schema/SettingsPageLayout.swift -df0d90fa0ee5ef1beeaa0107687a6c2ea89ebc64de9a9b0ce78e031c47b7d4ad Packages/macOS/CmuxNext/Sources/CmuxNextSettings/Schema/SettingsSchema+AgentPolicy.swift +db44b8993d8ad6f76cc03c358c7cb9150e5509729e852bd9cf879251ced89bdc Packages/macOS/CmuxNext/Sources/CmuxNextSettings/Schema/SettingsSchema+AgentPolicy.swift -f76d8c663cc2d6cab725246b7cd89c061d34f23b06678ae350700c44442bc40d Packages/macOS/CmuxNext/Sources/CmuxNextSettings/Schema/SettingsSchema+Appearance.swift +f33f544ba3b5b60f3758d2a87e9225a901d38beee3788e75db5114a62385af10 Packages/macOS/CmuxNext/Sources/CmuxNextSettings/Schema/SettingsSchema+Appearance.swift 4ead975e801e9fe33b9d2588e56502dda37eba321bd89fafb1ba4f9ee5216df4 Packages/macOS/CmuxNext/Sources/CmuxNextSettings/Schema/SettingsSchema+Browser.swift @@ -306,7 +310,7 @@ eb655a057201f9654748f0e16f21ae64fbbefd3c7555456dc7d73c7536c9d49c Packages/macOS 669b78d8ecb8c19f86101e76cb8db22c6ed0c380898f1db9aa720681f5a6c47f Packages/macOS/CmuxNext/Sources/CmuxNextSettings/Schema/SettingsSchema+ColorTransitionChoices.generated.swift -be3fdcb659272e0e009205c18a49c1d0a79abd62751322e621a5109a52a4dac5 Packages/macOS/CmuxNext/Sources/CmuxNextSettings/Schema/SettingsSchema+ColumnLayout.swift +f5776611ea40125fe6a1381ff98dfdb773721a5959e7fec5fa2fd0df19eb4455 Packages/macOS/CmuxNext/Sources/CmuxNextSettings/Schema/SettingsSchema+ColumnLayout.swift 2e03c002892fb8c6e36c4cdf57c180909d104b4babf211f2fe189d59b629dca8 Packages/macOS/CmuxNext/Sources/CmuxNextSettings/Schema/SettingsSchema+Feed.generated.swift @@ -314,7 +318,7 @@ be3fdcb659272e0e009205c18a49c1d0a79abd62751322e621a5109a52a4dac5 Packages/macOS 783ebcbcdc1c4435e2efb0e7e665fc4dcef37937dd1b367e60ca5b43ced483e9 Packages/macOS/CmuxNext/Sources/CmuxNextSettings/Schema/SettingsSchema+Labs.generated.swift -02b8f9af95ce9bc9311a4d50997315de4e39cda4bafc53818437f1d0a1d17706 Packages/macOS/CmuxNext/Sources/CmuxNextSettings/Schema/SettingsSchema+Notifications.swift +c94656228126013198462bd2aedcf840cf8e710a1a0381522fb4bdca08f59e98 Packages/macOS/CmuxNext/Sources/CmuxNextSettings/Schema/SettingsSchema+Notifications.swift 9fc2a537ca98fb8d1c1f5970785fb6069a2c8ae38255493f0c0faf6ca46d5628 Packages/macOS/CmuxNext/Sources/CmuxNextSettings/Schema/SettingsSchema+NowPlaying.generated.swift @@ -366,7 +370,7 @@ f159e3bf124c787c42af1947c8183db9dff4633be316b69be9d7fbfdd2969a8f Packages/macOS 9bb30cd765cecd196c1b207cfe10a1445cf3ff352bd0ba4dc834cfbd09f86ee4 Packages/macOS/CmuxNext/Sources/CmuxNextSettings/Schema/TabBarSettingsSchema.swift -3acf125015c5af760398b1c6750ff1ea50e142dbf04927eada2e3e108690d56b Packages/macOS/CmuxNext/Sources/CmuxNextSettings/Schema/TabWidthSettingsSchema.swift +01519d0c94a2b153e90e633dcf26cab60a82be07b9d1fd6dbf4a5fb24c60df77 Packages/macOS/CmuxNext/Sources/CmuxNextSettings/Schema/TabWidthSettingsSchema.swift 4983cd4140ecdb65efae65c6fc70cc6a5a55896fb354262b419a97a5fd62d38b Packages/macOS/CmuxNext/Sources/CmuxNextSettings/SessionSettings.swift @@ -374,7 +378,7 @@ f159e3bf124c787c42af1947c8183db9dff4633be316b69be9d7fbfdd2969a8f Packages/macOS a2f32c9482a44c922481a49e3046506bb7c2b282e8fb2a444157def024889e31 Packages/macOS/CmuxNext/Sources/CmuxNextSettings/SettingWriter.swift -d7dd504e294ff08c481ff87b1e97f09ff1b128c2848d259309d2f6f0bddfb891 Packages/macOS/CmuxNext/Sources/CmuxNextSettings/SettingsApplier.swift +1a93a670dd4446764206abb12726dca4013a5dc2d81ebaa90db5eedc39f102b6 Packages/macOS/CmuxNext/Sources/CmuxNextSettings/SettingsApplier.swift ca22aa36f5dfe9e5362a85a136755c0e1d9b58ec7fcd19e1adaa5a293f545763 Packages/macOS/CmuxNext/Sources/CmuxNextSettings/SettingsController+Chats.swift @@ -426,7 +430,7 @@ bacdac57633dd99d439fe5385f3ea01206e8fa15cadc14953ed03d206b606e10 Packages/macOS d95aaa8304c5d2deb2645696fda48aa9185b6330d7455e18fc544bae9abfe574 Packages/macOS/CmuxNext/Sources/CmuxNextSettings/SwapCmdTAndCmdNSetting.swift -e3dd503d5968f75b6180a50ca78d981c6d8278ad4a6ef63a32cf53c807a356cf Packages/macOS/CmuxNext/Sources/CmuxNextSettings/TabOverflowSetting.swift +10e35bde65757b7f8d24c5a2c4aedee7766656cbed284ec841a9a51fcb693abb Packages/macOS/CmuxNext/Sources/CmuxNextSettings/TabOverflowSetting.swift 7a20bc71928d2dd66f56f57f7c4267c14761af61ff547e4b6dc81fcd584a780a Packages/macOS/CmuxNext/Sources/CmuxNextSettings/TasksLayoutSetting.swift diff --git a/schemas/settings/settings-schema.json b/schemas/settings/settings-schema.json index 4f5f7a4f2cb9..bb5ff5964b40 100644 --- a/schemas/settings/settings-schema.json +++ b/schemas/settings/settings-schema.json @@ -58,6 +58,7 @@ "layout.dockColumnMode", "layout.frameOrientation", "layout.rows", + "layout.focusPaneOnScroll", "layout.minimumPaneWidth", "layout.minimumPaneHeight", "layout.newPanePlacement", @@ -313,6 +314,7 @@ "appearance.backdropArt", "appearance.background", "appearance.backgroundOpacity", + "appearance.glassLegibility", "appearance.backgroundBlur" ], "title" : { @@ -671,6 +673,16 @@ "text" : "Agent Chat" } }, + { + "key" : "settings.group.chiefChat", + "rows" : [ + "home.chiefBubbleStyle" + ], + "title" : { + "key" : "settings.group.chiefChat", + "text" : "Chief Chat" + } + }, { "key" : "settings.group.computerUse", "rows" : [ @@ -4771,6 +4783,58 @@ }, "validation" : "portable" }, + { + "accepts" : [ + true, + false + ], + "agent_refusal" : null, + "agent_settable" : true, + "consumers" : [ + "cmux-next" + ], + "default" : true, + "default_label" : null, + "group" : { + "key" : "settings.group.columns", + "text" : "Columns" + }, + "help" : { + "key" : "settings.layout.focusPaneOnScroll.help", + "text" : "Scrolling over a pane focuses it. Momentum and scrolling within a second of typing leave focus where it is." + }, + "kept_on_reset_all" : false, + "key" : "layout.focusPaneOnScroll", + "keywords" : [ + "focus", + "scroll", + "wheel", + "trackpad", + "pane", + "follows mouse" + ], + "kind" : "toggle", + "page_hidden" : false, + "path" : [ + "layout", + "focusPaneOnScroll" + ], + "refuses" : [ + "true", + 1, + null + ], + "section" : "general", + "summary" : { + "key" : "settings.layout.focusPaneOnScroll.summary", + "text" : "Scrolling a pane focuses it" + }, + "title" : { + "key" : "settings.layout.focusPaneOnScroll", + "text" : "Focus Pane on Scroll" + }, + "validation" : "portable" + }, { "accepts" : [ 80, @@ -9935,6 +9999,73 @@ }, "validation" : "portable" }, + { + "accepts" : [ + "primary", + "all" + ], + "agent_refusal" : null, + "agent_settable" : true, + "choices" : [ + { + "title" : { + "key" : "settings.choice.glassLegibility.primary", + "text" : "Main Text" + }, + "value" : "primary" + }, + { + "title" : { + "key" : "settings.choice.glassLegibility.all", + "text" : "All Text" + }, + "value" : "all" + } + ], + "consumers" : [ + "cmux-next" + ], + "default" : "primary", + "default_label" : null, + "group" : { + "key" : "settings.group.windowBackground", + "text" : "Window Background" + }, + "help" : { + "key" : "settings.appearance.glassLegibility.help", + "text" : "Main Text keeps primary text readable over any art and lets much more of the art through, like iOS. All Text also keeps secondary and dim text at full contrast, with denser glass." + }, + "kept_on_reset_all" : false, + "key" : "appearance.glassLegibility", + "keywords" : [ + "glass", + "legibility", + "contrast", + "readable", + "art", + "wallpaper", + "transparency", + "ios" + ], + "kind" : "choice", + "page_hidden" : false, + "path" : [ + "appearance", + "glassLegibility" + ], + "refuses" : [ + "__not_a_choice__", + 1, + true + ], + "section" : "appearance", + "summary" : null, + "title" : { + "key" : "settings.appearance.glassLegibility", + "text" : "Glass Over Art" + }, + "validation" : "portable" + }, { "accepts" : [ "frosted", @@ -26232,6 +26363,74 @@ }, "validation" : "portable" }, + { + "accepts" : [ + "imessage", + "theme" + ], + "agent_refusal" : null, + "agent_settable" : true, + "choices" : [ + { + "title" : { + "key" : null, + "text" : "iMessage" + }, + "value" : "imessage" + }, + { + "title" : { + "key" : "settings.choice.chiefBubbleStyle.theme", + "text" : "Theme" + }, + "value" : "theme" + } + ], + "consumers" : [ + "cmux-next" + ], + "default" : "imessage", + "default_label" : null, + "group" : { + "key" : "settings.group.chiefChat", + "text" : "Chief Chat" + }, + "help" : { + "key" : "settings.home.chiefBubbleStyle.help", + "text" : "iMessage shows your messages in blue and the Chief's in gray. Theme uses your theme's accent and surface colors." + }, + "kept_on_reset_all" : false, + "key" : "home.chiefBubbleStyle", + "keywords" : [ + "chief", + "imessage", + "messages", + "bubbles", + "blue", + "chat", + "theme", + "colors", + "home" + ], + "kind" : "choice", + "page_hidden" : false, + "path" : [ + "home", + "chiefBubbleStyle" + ], + "refuses" : [ + "__not_a_choice__", + 1, + true + ], + "section" : "home", + "summary" : null, + "title" : { + "key" : "settings.home.chiefBubbleStyle", + "text" : "Bubble Style" + }, + "validation" : "portable" + }, { "accepts" : [ true, @@ -26558,7 +26757,7 @@ "consumers" : [ "cmux-next" ], - "default" : "keystroke", + "default" : "focus", "default_label" : null, "group" : { "key" : "settings.group.dismissal", @@ -27612,8 +27811,8 @@ ], "default" : null, "default_label" : { - "key" : "settings.default.theme", - "text" : "Theme" + "key" : "settings.default.notificationBlue", + "text" : "Notification Blue" }, "group" : { "key" : "settings.group.attention", diff --git a/webviews/src/pages/shared/pageBase.css b/webviews/src/pages/shared/pageBase.css index 4690f599b781..49b2dcc996a4 100644 --- a/webviews/src/pages/shared/pageBase.css +++ b/webviews/src/pages/shared/pageBase.css @@ -19,9 +19,10 @@ /* Over a see-through window (desktop.ts sets data-cmux-see-through when the page background is not opaque) the text sits on the window tint over art. The native tint floor - (BackdropArtRange.legibleTintOpacity) holds secondary text at 4.5:1 over any art but tertiary - only at the 3:1 mark contrast, so tertiary text (labels such as "Add channel") takes the - secondary tier here. An opaque window keeps the tertiary tier. */ + (BackdropArtRange.legibleTintOpacity) holds primary text at 4.5:1 over any art; with + appearance.glassLegibility "all" it also holds secondary text at 4.5:1 and tertiary only at the + 3:1 mark contrast. Either way tertiary text (labels such as "Add channel") takes the secondary + tier here, the nearer one to the floor. An opaque window keeps the tertiary tier. */ :root[data-cmux-see-through] { --page-text-3: var(--page-text-2); }