Fixed delay in synchronization of font size increment and decrement (#…

…1609) * Fix font resize #1396 * Improve readability * Remove deprecated code
CodeEditApp · Mar 11, 2024 · 7c773f9 · 7c773f9
1 parent 0947f30
commit 7c773f9
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 20 deletions.
diff --git a/CodeEdit/Features/Settings/Models/AppSettings.swift b/CodeEdit/Features/Settings/Models/AppSettings.swift
@@ -15,35 +15,24 @@ struct AppSettings<T>: DynamicProperty where T: Equatable {
 
     let keyPath: WritableKeyPath<SettingsData, T>
 
-    @available(*,
-                deprecated,
-                message: """
-Use init(_ keyPath:) instead, otherwise the view will be reevaluated on every settings change.
-"""
-    )
-    init() where T == SettingsData {
-        self.keyPath = \.self
-        self.settings = .init(\.settings)
-    }
-
     init(_ keyPath: WritableKeyPath<SettingsData, T>) {
         self.keyPath = keyPath
-        let newKeyPath = (\EnvironmentValues.settings).appending(path: keyPath)
-        self.settings = .init(newKeyPath)
+        let settingsKeyPath = (\EnvironmentValues.settings).appending(path: keyPath)
+        self.settings = Environment(settingsKeyPath)
     }
 
     var wrappedValue: T {
         get {
-            settings.wrappedValue
+            Settings.shared.preferences[keyPath: keyPath]
         }
         nonmutating set {
             Settings.shared.preferences[keyPath: keyPath] = newValue
         }
     }
 
     var projectedValue: Binding<T> {
-        .init {
-            settings.wrappedValue
+        Binding {
+            Settings.shared.preferences[keyPath: keyPath]
         } set: {
             Settings.shared.preferences[keyPath: keyPath] = $0
         }

diff --git a/CodeEdit/Features/WindowCommands/ViewCommands.swift b/CodeEdit/Features/WindowCommands/ViewCommands.swift
@@ -47,20 +47,20 @@ struct ViewCommands: Commands {
 
             Menu("Font Size") {
                 Button("Increase") {
-                    if !(editorFontSize >= 288) {
+                    if editorFontSize < 288 {
                         editorFontSize += 1
                     }
-                    if !(terminalFontSize >= 288) {
+                    if terminalFontSize < 288 {
                         terminalFontSize += 1
                     }
                 }
                 .keyboardShortcut("+")
 
                 Button("Decrease") {
-                    if !(editorFontSize <= 1) {
+                    if editorFontSize > 1 {
                         editorFontSize -= 1
                     }
-                    if !(terminalFontSize <= 1) {
+                    if terminalFontSize > 1 {
                         terminalFontSize -= 1
                     }
                 }