Merge pull request #528 from benwoo1110/context-menu-setting

Add config option for right click on menubar

Author: jordanbaird

Ice/Events/EventManager.swift

@@ -256,6 +256,7 @@ extension EventManager {
     private func handleShowRightClickMenu() {
         guard
             let appState,
+            appState.settingsManager.advancedSettingsManager.showContextMenuOnRightClick,
             isMouseInsideEmptyMenuBarSpace,
             let mouseLocation = MouseCursor.locationAppKit
         else {

Ice/Settings/SettingsManagers/AdvancedSettingsManager.swift

@@ -34,6 +34,8 @@ final class AdvancedSettingsManager: ObservableObject {
     /// the user is dragging items in the menu bar.
     @Published var showAllSectionsOnUserDrag = true
 
+    @Published var showContextMenuOnRightClick = true
+
     /// Storage for internal observers.
     private var cancellables = Set<AnyCancellable>()
 
@@ -57,6 +59,7 @@ final class AdvancedSettingsManager: ObservableObject {
         Defaults.ifPresent(key: .showOnHoverDelay, assign: &showOnHoverDelay)
         Defaults.ifPresent(key: .tempShowInterval, assign: &tempShowInterval)
         Defaults.ifPresent(key: .showAllSectionsOnUserDrag, assign: &showAllSectionsOnUserDrag)
+        Defaults.ifPresent(key: .showContextMenuOnRightClick, assign: &showContextMenuOnRightClick)
     }
 
     private func configureCancellables() {
@@ -111,6 +114,13 @@ final class AdvancedSettingsManager: ObservableObject {
             }
             .store(in: &c)
 
+        $showContextMenuOnRightClick
+            .receive(on: DispatchQueue.main)
+            .sink { showAll in
+                Defaults.set(showAll, forKey: .showContextMenuOnRightClick)
+            }
+            .store(in: &c)
+
         cancellables = c
     }
 }

Ice/Settings/SettingsPanes/AdvancedSettingsPane.swift

@@ -32,6 +32,7 @@ struct AdvancedSettingsPane: View {
                 hideApplicationMenus
                 showSectionDividers
                 showAllSectionsOnUserDrag
+                showContextMenuOnRightClick
             }
             IceSection {
                 enableAlwaysHiddenSection
@@ -138,6 +139,11 @@ struct AdvancedSettingsPane: View {
         Toggle("Show all sections when Command + dragging menu bar items", isOn: manager.bindings.showAllSectionsOnUserDrag)
     }
 
+    @ViewBuilder
+    private var showContextMenuOnRightClick: some View {
+        Toggle("Show context menu on right click", isOn: manager.bindings.showContextMenuOnRightClick)
+    }
+
     @ViewBuilder
     private var allPermissions: some View {
         ForEach(appState.permissionsManager.allPermissions) { permission in

Ice/Utilities/Defaults.swift

@@ -165,6 +165,7 @@ extension Defaults {
         case showOnHoverDelay = "ShowOnHoverDelay"
         case tempShowInterval = "TempShowInterval"
         case showAllSectionsOnUserDrag = "ShowAllSectionsOnUserDrag"
+        case showContextMenuOnRightClick = "ShowContextMenuOnRightClick"
 
         // MARK: Menu Bar Appearance Settings