Fixing Font bugs (#1337)

Fixes font bugs
CodeEditApp · Jun 19, 2023 · c345316 · c345316
1 parent 31ac645
commit c345316
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/CodeEdit/Features/CodeFile/CodeFileView.swift b/CodeEdit/Features/CodeFile/CodeFileView.swift
@@ -36,6 +36,8 @@ struct CodeFileView: View {
 
     private let isEditable: Bool
 
+    private let systemFont: NSFont = .monospacedSystemFont(ofSize: 11, weight: .medium)
+
     init(codeFile: CodeFileDocument, isEditable: Bool = true) {
         self.codeFile = codeFile
         self.isEditable = isEditable
@@ -142,7 +144,10 @@ struct CodeFileView: View {
             self.selectedTheme = theme
         }
         .onChange(of: settingsFont) { _ in
-            font = Settings.shared.preferences.textEditing.font.current()
+            font = NSFont(
+                name: settingsFont.name,
+                size: CGFloat(settingsFont.size)
+            ) ?? systemFont
         }
         .onChange(of: bracketHighlight) { _ in
             bracketPairHighlight = getBracketPairHighlight()

diff --git a/CodeEdit/Features/Settings/Views/MonospacedFontPicker.swift b/CodeEdit/Features/Settings/Views/MonospacedFontPicker.swift
@@ -83,9 +83,9 @@ struct MonospacedFontPicker: View {
                 }
             }
         }
-        .onChange(of: selectedFontName) { selection in
+        .onChange(of: selectedFontName) { _ in
             if selectedFontName != "SF Mono" {
-                pushIntoRecentFonts(selection)
+                pushIntoRecentFonts(selectedFontName)
             }
         }
         .onAppear(perform: getFonts)