Merge remote-tracking branch 'tisfeng/dev' into add_setting_icon_to_s…

…hortcuts # Conflicts: # Easydict/Feature/Configuration/Configuration.swift
tisfeng · Mar 5, 2024 · c95d8c9 · c95d8c9
2 parents 738c278 + e420597
commit c95d8c9
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 6 deletions.
diff --git a/Easydict/Feature/Configuration/Configuration.swift b/Easydict/Feature/Configuration/Configuration.swift
@@ -126,10 +126,6 @@ class Configuration: NSObject {
 
     var cancellables: [AnyCancellable] = []
 
-    var fontSizeRatio: CGFloat {
-        fontSizes[Int(fontSizeIndex)]
-    }
-
     var automaticallyChecksForUpdates: Bool {
         get {
             updater.automaticallyChecksForUpdates
@@ -149,6 +145,11 @@ class Configuration: NSObject {
         }
     }
 
+    var fontSizeRatio: CGFloat {
+        let safeIndex = max(0, min(Int(fontSizeIndex), fontSizes.count - 1))
+        return fontSizes[safeIndex]
+    }
+
     static func destroySharedInstance() {
         shared = Configuration()
     }

diff --git a/Easydict/NewApp/Feature/Shortcut/Shortcut+Bind.swift b/Easydict/NewApp/Feature/Shortcut/Shortcut+Bind.swift
@@ -60,12 +60,16 @@ extension Shortcut {
 
     @objc
     func increaseFontSize() {
-        Configuration.shared.fontSizeIndex += 1
+        if Configuration.shared.fontSizeIndex < Configuration.shared.fontSizes.count - 1 {
+            Configuration.shared.fontSizeIndex += 1
+        }
     }
 
     @objc
     func decreaseFontSize() {
-        Configuration.shared.fontSizeIndex -= 1
+        if Configuration.shared.fontSizeIndex > 0 {
+            Configuration.shared.fontSizeIndex -= 1
+        }
     }
 
     @objc