Add repeated-press logic to cycle popup selection

p0deje · Dec 26, 2024 · 54b7b60 · 54b7b60
1 parent 1c6f694
commit 54b7b60
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 3 deletions.
diff --git a/Maccy/Extensions/Defaults.Keys+Names.swift b/Maccy/Extensions/Defaults.Keys+Names.swift
@@ -42,6 +42,7 @@ extension Defaults.Keys {
   static let pinTo = Key<PinsPosition>("pinTo", default: .top)
   static let popupPosition = Key<PopupPosition>("popupPosition", default: .cursor)
   static let popupScreen = Key<Int>("popupScreen", default: 0)
+  static let cyclePopUp = Key<Bool>("cyclePopUp", default: false)
   static let previewDelay = Key<Int>("previewDelay", default: 1500)
   static let removeFormattingByDefault = Key<Bool>("removeFormattingByDefault", default: false)
   static let searchMode = Key<Search.Mode>("searchMode", default: .exact)

diff --git a/Maccy/Observables/Popup.swift b/Maccy/Observables/Popup.swift
@@ -15,7 +15,15 @@ class Popup {
 
   init() {
     KeyboardShortcuts.onKeyUp(for: .popup) {
-      self.toggle()
+      if Defaults[.cyclePopUp] {
+        if (AppState.shared.appDelegate?.panel.isPresented ?? false) {
+          AppState.shared.highlightNext()
+        } else {
+          self.open(height: self.height)
+        }
+      } else {
+        self.toggle()
+      }
     }
   }
 

diff --git a/Maccy/Settings/GeneralSettingsPane.swift b/Maccy/Settings/GeneralSettingsPane.swift
@@ -34,8 +34,16 @@ struct GeneralSettingsPane: View {
 
       Settings.Section(label: { Text("Open", tableName: "GeneralSettings") }) {
         KeyboardShortcuts.Recorder(for: .popup)
-          .help(Text("OpenTooltip", tableName: "GeneralSettings"))
-      }
+            .help(Text("OpenTooltip", tableName: "GeneralSettings"))
+        Defaults.Toggle(key: .cyclePopUp) {
+            Text("CyclePopUp", tableName: "GeneralSettings")
+        }
+            .onChange(refreshModifiers)
+            .fixedSize()
+            .padding(.leading, 10)
+            .help(Text("CyclePopUpHelp", tableName: "GeneralSettings"))
+        }
+
       Settings.Section(label: { Text("Pin", tableName: "GeneralSettings") }) {
         KeyboardShortcuts.Recorder(for: .pin)
           .help(Text("PinTooltip", tableName: "GeneralSettings"))

diff --git a/Maccy/Settings/en.lproj/GeneralSettings.strings b/Maccy/Settings/en.lproj/GeneralSettings.strings
@@ -18,3 +18,5 @@
 "Regex" = "Regular expressions";
 "Mixed" = "Mixed";
 "NotificationsAndSounds" = "Notifications and sounds 􀱁";
+"CyclePopUp" = "Cycle selection on repeated press";
+"CyclePopUpHelp" = "When enabled, pressing the 'Open' shortcut again will select the next item in the clipboard history.";