Merge pull request #955 from ben-p-commits/line-height-preference

Add line height multiple option to text editing preferences

Author: lukepistrol

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

@@ -17,13 +17,18 @@ extension AppPreferences {
         /// The font to use in editor.
         var font: EditorFont = .init()
 
+        /// A flag indicating whether type-over completion is enabled
         var enableTypeOverCompletion: Bool = true
 
+        /// A flag indicating whether braces are automatically completed
         var autocompleteBraces: Bool = true
 
-        // A flag indicating whether to wrap lines to editor width
+        /// A flag indicating whether to wrap lines to editor width
         var wrapLinesToEditorWidth: Bool = true
 
+        /// A multiplier for setting the line height. Defaults to `1.45`
+        var lineHeightMultiple: Double = 1.45
+
         /// Default initializer
         init() {
             self.populateCommands()
@@ -40,6 +45,9 @@ extension AppPreferences {
                                                                     forKey: .autocompleteBraces) ?? true
             self.wrapLinesToEditorWidth = try container.decodeIfPresent(Bool.self,
                                                                     forKey: .wrapLinesToEditorWidth) ?? true
+            self.lineHeightMultiple = try container.decodeIfPresent(Double.self,
+                                                                    forKey: .lineHeightMultiple) ?? 1.45
+
             self.populateCommands()
         }
 

CodeEdit/Features/AppPreferences/Sections/TextEditingPreferences/TextEditingPreferencesView.swift

@@ -13,7 +13,7 @@ struct TextEditingPreferencesView: View {
     private var prefs: AppPreferencesModel = .shared
 
     /// only allows integer values in the range of `[1...8]`
-    private var numberFormat: NumberFormatter {
+    private var tabWidthFormatter: NumberFormatter {
         let formatter = NumberFormatter()
         formatter.allowsFloats = false
         formatter.minimum = 1
@@ -22,11 +22,24 @@ struct TextEditingPreferencesView: View {
         return formatter
     }
 
+    /// only allows float values in the range of `[0.75...2.00]`
+    /// and formats to 2 decimal places.
+    private var lineHeightFormatter: NumberFormatter {
+        let formatter = NumberFormatter()
+        formatter.allowsFloats = true
+        formatter.maximumFractionDigits = 2
+        formatter.minimumFractionDigits = 2
+        formatter.minimum = 0.75
+        formatter.maximum = 2.0
+
+        return formatter
+    }
+
     var body: some View {
         PreferencesContent {
             PreferencesSection("Default Tab Width") {
                 HStack(spacing: 5) {
-                    TextField("", value: $prefs.preferences.textEditing.defaultTabWidth, formatter: numberFormat)
+                    TextField("", value: $prefs.preferences.textEditing.defaultTabWidth, formatter: tabWidthFormatter)
                         .multilineTextAlignment(.trailing)
                         .frame(width: 40)
                     Stepper("Default Tab Width:",
@@ -38,6 +51,9 @@ struct TextEditingPreferencesView: View {
             PreferencesSection("Font") {
                 fontSelector
             }
+            PreferencesSection("Line Height") {
+                lineHeight
+            }
             PreferencesSection("Code completion") {
                 autocompleteBraces
                 enableTypeOverCompletion
@@ -86,4 +102,15 @@ struct TextEditingPreferencesView: View {
         }
     }
 
+    private var lineHeight: some View {
+        HStack(spacing: 5) {
+            TextField("", value: $prefs.preferences.textEditing.lineHeightMultiple, formatter: lineHeightFormatter)
+                .multilineTextAlignment(.trailing)
+                .frame(width: 40)
+            Stepper("Line Height:",
+                    value: $prefs.preferences.textEditing.lineHeightMultiple,
+                    in: 0.75...2.0,
+                    step: 0.05)
+        }
+    }
 }

CodeEdit/Features/CodeFile/CodeFileView.swift

@@ -69,7 +69,7 @@ struct CodeFileView: View {
             theme: $selectedTheme.editor.editorTheme,
             font: $font,
             tabWidth: $prefs.preferences.textEditing.defaultTabWidth,
-            lineHeight: .constant(1.2), // TODO: Add to preferences
+            lineHeight: $prefs.preferences.textEditing.lineHeightMultiple,
             wrapLines: $prefs.preferences.textEditing.wrapLinesToEditorWidth,
             cursorPosition: codeFile.$cursorPosition
         )