Editing of lightness pairs.

Author: macmade

ColorSet/Classes/LightnessPairCollectionViewItem.swift

@@ -34,4 +34,20 @@ public class LightnessPairCollectionViewItem: NSCollectionViewItem
         self.color1.bind( NSBindingName( "color" ), to: self, withKeyPath: "representedObject.lightness1.color", options: nil )
         self.color2.bind( NSBindingName( "color" ), to: self, withKeyPath: "representedObject.lightness2.color", options: nil )
     }
+    
+    @IBAction func edit( _ sender: Any? )
+    {
+        if let item = self.representedObject as? LightnessPairItem
+        {
+            item.onEdit?( item )
+        }
+    }
+    
+    @IBAction func delete( _ sender: Any? )
+    {
+        if let item = self.representedObject as? LightnessPairItem
+        {
+            item.onDelete?( item )
+        }
+    }
 }

ColorSet/Classes/LightnessPairItem.swift

@@ -63,6 +63,9 @@ import Cocoa
     @objc public private( set ) dynamic var lightness1: LightnessVariant
     @objc public private( set ) dynamic var lightness2: LightnessVariant
 
+    public var onEdit:   ( ( LightnessPairItem ) -> Void )?
+    public var onDelete: ( ( LightnessPairItem ) -> Void )?
+    
     init( base: ColorItem? )
     {
         self.lightness1 = LightnessVariant( base: base )

ColorSet/Classes/LightnessPairWindowController.swift

@@ -28,11 +28,11 @@ class LightnessPairWindowController: NSWindowController
 {
     @objc public private( set ) dynamic var item = LightnessPairItem( base: nil )
 
-    convenience init( base: ColorItem )
+    convenience init( base: ColorItem, item: LightnessPairItem )
     {
         self.init()
 
-        self.item = LightnessPairItem( base: base )
+        self.item = item
     }
 
     override var windowNibName: NSNib.Name?

ColorSet/Classes/MainWindowController.swift

@@ -172,6 +172,16 @@ class MainWindowController: NSWindowController, NSTableViewDelegate, NSTableView
         {
             l.lightness1.base = self.selectedColor
             l.lightness2.base = self.selectedColor
+            
+            l.onEdit =
+            {
+                [ weak self ] item in self?.editLightnessPair( item )
+            }
+            
+            l.onDelete =
+            {
+                [ weak self ] item in self?.lightnessPairsArrayController.removeObject( item )
+            }
         }
     }
 
@@ -383,6 +393,19 @@ class MainWindowController: NSWindowController, NSTableViewDelegate, NSTableView
     }
 
     @IBAction func addLightnessPair( _ sender: Any? )
+    {
+        self.editLightnessPair( nil )
+        {
+            [ weak self ] c, r in
+            
+            if r == .OK
+            {
+                self?.lightnessPairsArrayController.addObject( c.item )
+            }
+        }
+    }
+    
+    func editLightnessPair( _ item: LightnessPairItem?, completion: ( ( LightnessPairWindowController, NSApplication.ModalResponse ) -> Void )? = nil )
     {
         guard let selectedColor = self.selectedColor else
         {
@@ -405,7 +428,9 @@ class MainWindowController: NSWindowController, NSTableViewDelegate, NSTableView
             return
         }
 
-        let sheetController = LightnessPairWindowController( base: selectedColor )
+        let o = item ?? LightnessPairItem( base: selectedColor )
+        
+        let sheetController = LightnessPairWindowController( base: selectedColor, item: o )
 
         guard let sheet = sheetController.window else
         {
@@ -424,10 +449,13 @@ class MainWindowController: NSWindowController, NSTableViewDelegate, NSTableView
 
             if r != .OK
             {
+                completion?( sheetController, r )
+                
                 return
             }
 
-            self.lightnessPairsArrayController.addObject( sheetController.item )
+            completion?( sheetController, r )
+            self.updateLightnesses()
         }
     }
 }

ColorSet/Classes/PaletteColorItem.swift

@@ -101,12 +101,12 @@ import ColorSetKit
             lightnesses.append( ( l2, c2 ) )
         }
 
-        if let color = info.colorPair.color
+        if let color = info.colorPair.color?.usingColorSpace( .sRGB )
         {
             lightnesses.append( ( color.hsl().lightness, color ) )
         }
 
-        if let variant = info.colorPair.variant
+        if let variant = info.colorPair.variant?.usingColorSpace( .sRGB )
         {
             lightnesses.append( ( variant.hsl().lightness, variant ) )
         }

ColorSet/Interface/Base.lproj/ColorSet.LightnessPairCollectionViewItem.xib

@@ -121,7 +121,27 @@
                 <constraint firstItem="nc5-o0-Gmi" firstAttribute="centerY" secondItem="2Zs-NC-huo" secondAttribute="centerY" id="vjc-bo-W29"/>
                 <constraint firstAttribute="trailing" secondItem="tQ1-DE-98J" secondAttribute="trailing" id="yOg-WX-fDY"/>
             </constraints>
+            <connections>
+                <outlet property="menu" destination="8VB-Yx-MB9" id="MSF-8c-Y2e"/>
+            </connections>
             <point key="canvasLocation" x="28" y="112"/>
         </customView>
+        <menu id="8VB-Yx-MB9">
+            <items>
+                <menuItem title="Edit..." id="UIj-Rw-Vni">
+                    <modifierMask key="keyEquivalentModifierMask"/>
+                    <connections>
+                        <action selector="edit:" target="-2" id="GH8-c8-DsD"/>
+                    </connections>
+                </menuItem>
+                <menuItem title="Delete" id="qRQ-V5-aS8">
+                    <modifierMask key="keyEquivalentModifierMask"/>
+                    <connections>
+                        <action selector="delete:" target="-2" id="VaS-JE-ToR"/>
+                    </connections>
+                </menuItem>
+            </items>
+            <point key="canvasLocation" x="139" y="238"/>
+        </menu>
     </objects>
 </document>