pref: shortcut cmd + C conflict (#446)

* pref: shortcut store logic * fix: remove store keyCombo when user clear --------- Co-authored-by: Tisfeng <tisfeng@gmail.com>
tisfeng · Mar 10, 2024 · 838b1d3 · 838b1d3
1 parent 1c9c88f
commit 838b1d3
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/Easydict/NewApp/Feature/Shortcut/Shortcut.swift b/Easydict/NewApp/Feature/Shortcut/Shortcut.swift
@@ -162,8 +162,8 @@ extension Shortcut {
 // binding shortcut
 extension Shortcut {
     func bindingShortcut(keyCombo: KeyCombo?, type: ShortcutType) {
+        HotKeyCenter.shared.unregisterHotKey(with: type.rawValue)
         guard let keyCombo else {
-            HotKeyCenter.shared.unregisterHotKey(with: type.rawValue)
             return
         }
         var hotKey: HotKey?

diff --git a/Easydict/NewApp/View/SettingView/Tabs/View/Shortcut/KeyHolderWrapper.swift b/Easydict/NewApp/View/SettingView/Tabs/View/Shortcut/KeyHolderWrapper.swift
@@ -79,14 +79,17 @@ extension KeyHolderWrapper {
         @Binding var confictAlterMessage: ShortcutConfictAlertMessage
 
         func recordViewShouldBeginRecording(_: KeyHolder.RecordView) -> Bool {
-            true
+            Configuration.shared.isRecordingSelectTextShortcutKey = true
+            return true
         }
 
         func recordView(_: KeyHolder.RecordView, canRecordKeyCombo _: Magnet.KeyCombo) -> Bool {
             true
         }
 
-        func recordViewDidEndRecording(_: RecordView) {}
+        func recordViewDidEndRecording(_: RecordView) {
+            Configuration.shared.isRecordingSelectTextShortcutKey = false
+        }
 
         func recordView(_ recordView: RecordView, didChangeKeyCombo keyCombo: KeyCombo?) {
             if let key = keyCombo {
@@ -103,6 +106,7 @@ extension KeyHolderWrapper {
                         message: message
                     )
                     recordView.clear()
+                    HotKeyCenter.shared.unregisterHotKey(with: type.rawValue)
                     return
                 }
             } else { // clear shortcut