Allow to add additional separator after "Clear" item

Closes #45
p0deje · Sep 11, 2019 · 4d4af25 · 4d4af25
1 parent 448fe5e
commit 4d4af25
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/Maccy/Maccy.swift b/Maccy/Maccy.swift
@@ -7,6 +7,7 @@ class Maccy {
 
   private let showInStatusBar = "showInStatusBar"
   private let pasteByDefault = "pasteByDefault"
+  private let saratovSeparator = "enableSaratovSeparator"
 
   private let history: History
   private let clipboard: Clipboard
@@ -28,7 +29,7 @@ class Maccy {
     self.clipboard = clipboard
     menu.history = history
 
-    UserDefaults.standard.register(defaults: [showInStatusBar: true, pasteByDefault: false])
+    UserDefaults.standard.register(defaults: [showInStatusBar: true, pasteByDefault: false, saratovSeparator: false])
   }
 
   func start() {
@@ -74,6 +75,9 @@ class Maccy {
   private func populateFooter() {
     menu.addItem(NSMenuItem.separator())
     menu.addItem(clearItem)
+    if UserDefaults.standard.bool(forKey: saratovSeparator) {
+      menu.addItem(NSMenuItem.separator())
+    }
     menu.addItem(aboutItem)
     menu.addItem(NSMenuItem(title: "Quit", action: #selector(NSApp.stop), keyEquivalent: "q"))
   }

diff --git a/Maccy/Menu.swift b/Maccy/Menu.swift
@@ -173,7 +173,7 @@ class Menu: NSMenu, NSMenuDelegate {
   }
 
   private func isSystemItem(item: NSMenuItem) -> Bool {
-    let items = allItems.split(whereSeparator: { $0.isSeparatorItem })
+    let items = allItems.split(maxSplits: 1, omittingEmptySubsequences: true, whereSeparator: { $0.isSeparatorItem })
     return items.count > 1 && items[1].contains(item)
   }
 }