Merge pull request #2461 from JoshuaBrest/main

feat: Update MacOS about dialog

macos/Sources/Features/About/About.xib

@@ -14,7 +14,7 @@
         <customObject id="-1" userLabel="First Responder" customClass="FirstResponder"/>
         <customObject id="-3" userLabel="Application" customClass="NSObject"/>
         <window allowsToolTipsWhenApplicationIsInactive="NO" autorecalculatesKeyViewLoop="NO" releasedWhenClosed="NO" animationBehavior="default" titlebarAppearsTransparent="YES" id="QvC-M9-y7g">
-            <windowStyleMask key="styleMask" titled="YES" closable="YES"/>
+            <windowStyleMask key="styleMask" titled="YES" closable="YES" fullSizeContentView="YES"/>
             <windowPositionMask key="initialPositionMask" leftStrut="YES" rightStrut="YES" topStrut="YES" bottomStrut="YES"/>
             <rect key="contentRect" x="196" y="240" width="300" height="172"/>
             <rect key="screenRect" x="0.0" y="0.0" width="3008" height="1667"/>

macos/Sources/Features/About/AboutController.swift

@@ -10,6 +10,7 @@ class AboutController: NSWindowController, NSWindowDelegate {
     override func windowDidLoad() {
         guard let window = window else { return }
         window.center()
+        window.isMovableByWindowBackground = true
         window.contentView = NSHostingView(rootView: AboutView())
     }
 

macos/Sources/Features/About/AboutView.swift

@@ -1,35 +1,136 @@
 import SwiftUI
 
 struct AboutView: View {
+    @Environment(\.openURL) var openURL
+
+    private let githubLink = URL(string: "https://github.com/ghostty-org/ghostty")
+
     /// Read the commit from the bundle.
-    var build: String? { Bundle.main.infoDictionary?["CFBundleVersion"] as? String }
+    private var build: String? { Bundle.main.infoDictionary?["CFBundleVersion"] as? String }
-    var commit: String? { Bundle.main.infoDictionary?["GhosttyCommit"] as? String }
+    private var commit: String? { Bundle.main.infoDictionary?["GhosttyCommit"] as? String }
-    var version: String? { Bundle.main.infoDictionary?["CFBundleShortVersionString"] as? String }
+    private var version: String? { Bundle.main.infoDictionary?["CFBundleShortVersionString"] as? String }
+    private var copyright: String? { Bundle.main.infoDictionary?["NSHumanReadableCopyright"] as? String }
+
+    private var properties: [KeyValue<String>] {
+        let list: [KeyValue<String?>] = [
+            .init(key: "Version", value: version),
+            .init(key: "Build", value: build),
+            .init(key: "Commit", value: commit == "" ? nil : commit)
+        ]
+
+        return list.compactMap {
+            guard let value = $0.value else { return nil }
+            return .init(key: $0.key, value: value)
+        }
+    }
+
+    private struct KeyValue<Value: Equatable>: Identifiable {
+        var id = UUID()
+        public let key: LocalizedStringResource
+        public let value: Value
+    }
+
+    #if os(macOS)
+    // This creates a background style similar to the Apple "About My Mac" Window
+    private struct VisualEffectBackground: NSViewRepresentable {
+        let material: NSVisualEffectView.Material
+        let blendingMode: NSVisualEffectView.BlendingMode
+        let isEmphasized: Bool
+
+        init(material: NSVisualEffectView.Material,
+             blendingMode: NSVisualEffectView.BlendingMode = .behindWindow,
+             isEmphasized: Bool = false)
+        {
+            self.material = material
+            self.blendingMode = blendingMode
+            self.isEmphasized = isEmphasized
+        }
+
+        func updateNSView(_ nsView: NSVisualEffectView, context: Context) {
+            nsView.material = material
+            nsView.blendingMode = blendingMode
+            nsView.isEmphasized = isEmphasized
+        }
+
+        func makeNSView(context: Context) -> NSVisualEffectView {
+            let visualEffect = NSVisualEffectView()
+            visualEffect.autoresizingMask = [.width, .height]
+            return visualEffect
+        }
+    }
+    #endif
 
     var body: some View {
         VStack(alignment: .center) {
             Image("AppIconImage")
                 .resizable()
                 .aspectRatio(contentMode: .fit)
-                .frame(maxHeight: 96)
+                .frame(height: 128)
 
-            Text("Ghostty")
+            VStack(alignment: .center, spacing: 32) {
-                .font(.title3)
+                VStack(alignment: .center, spacing: 8) {
+                    Text("Ghostty")
+                        .bold()
+                        .font(.title)
+                    Text("Fast, native, feature-rich terminal \nemulator pushing modern features.")
+                        .multilineTextAlignment(.center)
+                        .fixedSize(horizontal: false, vertical: true)
+                        .font(.caption)
+                        .tint(.secondary)
+                        .opacity(0.8)
+                }
                 .textSelection(.enabled)
+                VStack(spacing: 2) {
+                    ForEach(properties) { item in
+                        HStack(spacing: 4) {
+                                Text(item.key)
+                                    .frame(width: 126, alignment: .trailing)
+                                    .padding(.trailing, 2)
+                                Text(item.value)
+                                    .frame(width: 125, alignment: .leading)
+                                    .padding(.leading, 2)
+                                    .tint(.secondary)
+                                    .opacity(0.8)
+                        }
+                        .font(.callout)
+                        .textSelection(.enabled)
+                        .frame(maxWidth: .infinity)
+                    }
+                }
+                .frame(maxWidth: .infinity)
 
-            if let version = self.version {
+                HStack(spacing: 8) {
-                Text("Version: \(version)")
+                    if let url = githubLink {
-                    .font(.body)
+                        Button("GitHub") {
-                    .textSelection(.enabled)
+                            openURL(url)
-            }
+                        }
+                    }
 
-            if let build = self.build {
+                }
-                Text("Build: \(build)")
+
-                    .font(.body)
+                if let copy = self.copyright {
-                    .textSelection(.enabled)
+                    Text(copy)
+                        .font(.caption)
+                        .textSelection(.enabled)
+                        .tint(.secondary)
+                        .opacity(0.8)
+                        .multilineTextAlignment(.center)
+                        .frame(maxWidth: .infinity)
+                }
             }
+            .frame(maxWidth: .infinity)
         }
-        .frame(minWidth: 300)
+        .padding(.top, 8)
-        .padding()
+        .padding(32)
+        .frame(minWidth: 256)
+        #if os(macOS)
+        .background(VisualEffectBackground(material: .underWindowBackground).ignoresSafeArea())
+        #endif
+    }
+}
+
+struct AboutView_Previews: PreviewProvider {
+    static var previews: some View {
+        AboutView()
     }
 }