Merge pull request #957 from ben-p-commits/revert-to-system-font-bugfix

Fix bug which prevented reverting to system font after using custom font.

Author: lukepistrol

CodeEdit/Features/AppPreferences/Model/Text Editing/TextEditingPreferences.swift

@@ -5,6 +5,7 @@
 //  Created by Nanashi Li on 2022/04/08.
 //
 
+import AppKit
 import Foundation
 
 extension AppPreferences {
@@ -101,5 +102,17 @@ extension AppPreferences {
             self.size = try container.decodeIfPresent(Int.self, forKey: .size) ?? 11
             self.name = try container.decodeIfPresent(String.self, forKey: .name) ?? "SFMono-Medium"
         }
+
+        /// Returns an NSFont representation of the current configuration.
+        ///
+        /// Returns the custom font, if enabled and able to be instantiated.
+        /// Otherwise returns a default system font monospaced, size 12.
+        func current() -> NSFont {
+            guard customFont,
+                  let customFont = NSFont(name: name, size: Double(size)) else {
+                return NSFont.monospacedSystemFont(ofSize: 12, weight: .regular)
+            }
+            return customFont
+        }
     }
 }

CodeEdit/Features/CodeFile/CodeFileView.swift

@@ -57,9 +57,7 @@ struct CodeFileView: View {
 
     @State
     private var font: NSFont = {
-        let size = AppPreferencesModel.shared.preferences.textEditing.font.size
-        let name = AppPreferencesModel.shared.preferences.textEditing.font.name
-        return NSFont(name: name, size: Double(size)) ?? NSFont.monospacedSystemFont(ofSize: 12, weight: .regular)
+        return AppPreferencesModel.shared.preferences.textEditing.font.current()
     }()
 
     var body: some View {
@@ -89,10 +87,7 @@ struct CodeFileView: View {
             }
         }
         .onChange(of: prefs.preferences.textEditing.font) { _ in
-            font = NSFont(
-                name: prefs.preferences.textEditing.font.name,
-                size: Double(prefs.preferences.textEditing.font.size)
-            ) ?? .monospacedSystemFont(ofSize: 12, weight: .regular)
+            font = AppPreferencesModel.shared.preferences.textEditing.font.current()
         }
     }