Separate code font size

mac/Sources/Byre/Fonts.swift

@@ -11,24 +11,29 @@ final class FontSize {
     static let range = 9...20
 
     private(set) var body = PrefsRecord.defaultFontSize
+    private(set) var code = PrefsRecord.defaultFontSize
 
     private init() {
         load()
     }
 
     func load() {
-        body = record()?.fontSize ?? PrefsRecord.defaultFontSize
+        let r = record()
+        body = r?.fontSize ?? PrefsRecord.defaultFontSize
+        code = r?.codeFontSize ?? PrefsRecord.defaultFontSize
     }
 
-    func set(_ size: Int) {
+    func set(body: Int, code: Int) {
         if let r = record() {
-            r.fontSize = size
+            r.fontSize = body
+            r.codeFontSize = code
             r.saved = Date()
         } else {
-            persistence.insert(PrefsRecord(fontSize: size))
+            persistence.insert(PrefsRecord(fontSize: body, codeFontSize: code))
         }
         saveRecords()
-        body = size
+        self.body = body
+        self.code = code
     }
 
     private func record() -> PrefsRecord? {
@@ -52,10 +57,10 @@ enum Fonts {
 
     private static let fonts = Mutex<[String: CTFont]>([:])
 
-    // Call sites give sizes relative to a 13pt body; the user's font size shifts them all.
+    // Call sites give sizes relative to a 13pt body; the user's text or code size shifts them.
     @MainActor
     private static func cached(_ size: CGFloat, _ weight: CGFloat, _ italic: Bool, _ mono: Bool) -> CTFont {
-        let size = size + CGFloat(FontSize.shared.body - 13)
+        let size = size + CGFloat((mono ? FontSize.shared.code : FontSize.shared.body) - 13)
         let key = "\(size) \(weight) \(italic) \(mono)"
         return fonts.withLock { fonts in
             if let f = fonts[key] {

mac/Sources/Byre/Persistence.swift

@@ -43,10 +43,12 @@ final class PrefsRecord {
     static let defaultFontSize = 12
 
     var fontSize = PrefsRecord.defaultFontSize
+    var codeFontSize = PrefsRecord.defaultFontSize
     var saved = Date.distantPast
 
-    init(fontSize: Int) {
+    init(fontSize: Int, codeFontSize: Int) {
         self.fontSize = fontSize
+        self.codeFontSize = codeFontSize
         saved = Date()
     }
 }

mac/Sources/Byre/Settings.swift

@@ -28,10 +28,15 @@ struct SettingsView: View {
                     .fixedSize(horizontal: false, vertical: true)
                 ServerColorPicker()
                 heading("Font size")
-                Text("The size of body text, on every Mac you use. Other text grows and shrinks with it.")
+                Text("The size of body text and of code, on every Mac you use. Other text grows and shrinks with them.")
                     .foregroundStyle(Palette.muted)
                     .fixedSize(horizontal: false, vertical: true)
-                FontSizeStepper()
+                FontSizeStepper(label: "Text", size: FontSize.shared.body) { n in
+                    FontSize.shared.set(body: n, code: FontSize.shared.code)
+                }
+                FontSizeStepper(label: "Code", size: FontSize.shared.code) { n in
+                    FontSize.shared.set(body: FontSize.shared.body, code: n)
+                }
                 heading("Notifications")
                 DeviceNotifications()
                 PrefsBox()
@@ -98,21 +103,26 @@ private struct ServerColorPicker: View {
 }
 
 private struct FontSizeStepper: View {
+    let label: String
+    let size: Int
+    let set: (Int) -> Void
+
     var body: some View {
-        let fonts = FontSize.shared
         HStack(spacing: 8) {
+            Text(label)
+                .frame(width: 48, alignment: .leading)
             Button("−") {
-                fonts.set(fonts.body - 1)
+                set(size - 1)
             }
             .buttonStyle(WebButtonStyle())
-            .disabled(fonts.body <= FontSize.range.lowerBound)
-            Text("\(fonts.body) pt")
+            .disabled(size <= FontSize.range.lowerBound)
+            Text("\(size) pt")
                 .monospacedDigit()
             Button("+") {
-                fonts.set(fonts.body + 1)
+                set(size + 1)
             }
             .buttonStyle(WebButtonStyle())
-            .disabled(fonts.body >= FontSize.range.upperBound)
+            .disabled(size >= FontSize.range.upperBound)
         }
         .padding(.top, 8)
     }
@@ -123,7 +133,7 @@ private struct SyncState: View {
         TimelineView(.periodic(from: .now, by: 30)) { _ in
             if let sync = Servers.shared.sync {
                 if sync.ok {
-                    Text("This Mac shares its servers, window colors, font size, drafts and task visits through iCloud. Last synced \(ago(sync.at)).")
+                    Text("This Mac shares its servers, window colors, font sizes, drafts and task visits through iCloud. Last synced \(ago(sync.at)).")
                         .fixedSize(horizontal: false, vertical: true)
                 } else {
                     Text("iCloud sync is failing on this Mac, so changes made here aren't reaching your other Macs. Failed \(ago(sync.at)): \(sync.error ?? "")")