edit items on double-click

Author: DivineDominion

Example/AddItemController.swift

@@ -21,6 +21,7 @@ class AddItemController: NSWindowController, NSTextFieldDelegate {
         didSet {
             displayTitle()
             displayImage()
+            displayTintColor()
         }
     }
 
@@ -34,6 +35,13 @@ class AddItemController: NSWindowController, NSTextFieldDelegate {
         iconImageView.image = viewModel.image
     }
 
+    private func displayTintColor() {
+
+        guard let color = viewModel.tintColor else { return }
+
+        tintColorWell.color = color
+    }
+
     @IBAction func browseImage(_ sender: Any) {
 
         let panel = NSOpenPanel()
@@ -78,11 +86,14 @@ class AddItemController: NSWindowController, NSTextFieldDelegate {
     // MARK: -
     // MARK: Showing as Sheet
 
-    func showSheet(in hostingWindow: NSWindow, completion: @escaping (NewItem?) -> Void) {
+    func showSheet(
+        in hostingWindow: NSWindow,
+        initialValues: NewItem? = nil,
+        completion: @escaping (NewItem?) -> Void) {
 
         guard let window = self.window else { preconditionFailure("expected window outlet") }
 
-        self.viewModel = .empty
+        self.viewModel = initialValues ?? NewItem.empty
 
         hostingWindow.beginSheet(window) {
 

Example/AppDelegate.swift

@@ -20,10 +20,14 @@ extension SavedSearch {
             image: newItem.image ?? SavedSearch.defaultImage,
             tintColor: newItem.tintColor)
     }
+
+    var newItem: NewItem {
+        return NewItem(title: self.title, image: self.image, tintColor: self.tintColor)
+    }
 }
 
 @NSApplicationMain
-class AppDelegate: NSObject, NSApplicationDelegate, FatSidebarDelegate, FatSidebarSelectionChangeDelegate {
+class AppDelegate: NSObject, NSApplicationDelegate, FatSidebarDelegate {
 
     @IBOutlet weak var addItemController: AddItemController!
     @IBOutlet weak var itemContextualMenu: NSMenu!
@@ -47,13 +51,19 @@ class AppDelegate: NSObject, NSApplicationDelegate, FatSidebarDelegate, FatSideb
     func applicationDidFinishLaunching(_ aNotification: Notification) {
 
         fatSidebar.delegate = self
-        fatSidebar.selectionDelegate = self
         fatSidebar.theme = OmniFocusTheme()
         fatSidebar.selectionMode = .toggleOne
 
         fatSidebar.sidebarContextualMenu = itemContextualMenu
         fatSidebar.itemContextualMenu = itemContextualMenu
 
+        replaceSidebarWithModel()
+    }
+
+    fileprivate func replaceSidebarWithModel() {
+
+        fatSidebar.removeAllItems()
+
         for savedSearch in savedSearches {
             fatSidebar.appendItem(savedSearch)
         }
@@ -84,6 +94,21 @@ class AppDelegate: NSObject, NSApplicationDelegate, FatSidebarDelegate, FatSideb
         savedSearches.insert(item, at: newIndex)
     }
 
+    func sidebar(_ sidebar: FatSidebar, editItem index: Int) {
+
+        let oldValues = savedSearches[index].newItem
+        addItemController.showSheet(in: self.window, initialValues: oldValues) { item in
+
+            guard let item = item else { return }
+
+            let savedSearch = SavedSearch(fromNewItem: item)
+            self.savedSearches.remove(at: index)
+            self.savedSearches.insert(savedSearch, at: index)
+
+            self.replaceSidebarWithModel()
+        }
+    }
+
     func sidebar(_ sidebar: FatSidebar, didChangeSelection selectionIndex: Int) {
 
         Swift.print("Selected \(savedSearches[selectionIndex])")

Example/Base.lproj/MainMenu.xib

@@ -877,7 +877,7 @@ Gw
                                     <constraint firstAttribute="width" constant="44" id="cS0-GX-0ZC"/>
                                     <constraint firstAttribute="width" secondItem="WNP-ao-kAS" secondAttribute="height" multiplier="44:23" id="vkH-ei-cJr"/>
                                 </constraints>
-                                <color key="color" red="0.05813049898" green="0.055541899059999997" blue="1" alpha="1" colorSpace="calibratedRGB"/>
+                                <color key="color" red="0.35637060218042749" green="0.35540069113744255" blue="0.3956792091836735" alpha="1" colorSpace="calibratedRGB"/>
                                 <connections>
                                     <action selector="colorChanged:" target="u4l-yW-Ovo" id="TeL-KH-Hpd"/>
                                 </connections>

FatSidebar/FatSidebar.swift

@@ -7,8 +7,14 @@ class FlippedView: NSView {
 }
 
 public protocol FatSidebarDelegate: class {
+    /// Triggered after the user finishes dragging an item into a new place. 
     func sidebar(_ sidebar: FatSidebar, didMoveItemFrom oldIndex: Int, to newIndex: Int)
+
+    /// Triggered when an item is single-clicked and its status changes. 
+    /// Already selected items that cannot be deselected will not trigger this.
     func sidebar(_ sidebar: FatSidebar, didChangeSelection selectionIndex: Int)
+
+    /// Triggered by double-clicking an item.
     func sidebar(_ sidebar: FatSidebar, editItem index: Int)
 }