Color palette preview

Author: macmade

ColorSet/Classes/PaletteColorItem.swift

@@ -79,5 +79,65 @@ import ColorSetKit
         p.y          += 15
 
         ( hslString as NSString ).draw( at: p, withAttributes: [ .foregroundColor : textColor, .font : NSFont.systemFont( ofSize: 12, weight: .thin ) ] )
+        
+        var lightnesses = [ ( CGFloat, NSColor ) ]()
+        
+        for lp in info.colorPair.lightnesses
+        {
+            let l1 = lp.lightness1.lightness
+            let l2 = lp.lightness2.lightness
+            var c1 = base.byChangingLightness( l1 )
+            var c2 = base.byChangingLightness( l2 )
+            
+            if #available( macOS 10.14, * )
+            {
+                if NSApp.effectiveAppearance.name == .darkAqua
+                {
+                    swap( &c1, &c2 )
+                }
+            }
+            
+            lightnesses.append( ( l1, c1 ) )
+            lightnesses.append( ( l2, c2 ) )
+        }
+        
+        if let color = info.colorPair.color
+        {
+            lightnesses.append( ( color.hsl().lightness, color ) )
+        }
+        
+        if let variant = info.colorPair.variant
+        {
+            lightnesses.append( ( variant.hsl().lightness, variant ) )
+        }
+        
+        lightnesses.sort
+        {
+            l1, l2 in l1.0 > l2.0
+        }
+        
+        if lightnesses.count > 0
+        {
+            let width     = rect.size.width / CGFloat( lightnesses.count )
+            var r         = rect
+            r.size.width  = width
+            r.size.height = r.size.height / 4
+            r.origin.y    = rect.size.height - r.size.height
+            
+            for lightness in lightnesses
+            {
+                let color = lightness.1
+                
+                color.setFill()
+                r.fill()
+                
+                let textColor = NSColor.bestTextColorForBackgroundColor( color )
+                let p         = NSMakePoint( r.origin.x - 8 + ( r.size.width / 2 ), r.origin.y - 5 + ( r.size.height / 2 ) )
+                
+                String( format: "%.0f", lightness.0 * 100 ).draw( at: p, withAttributes: [ .foregroundColor : textColor, .font : NSFont.systemFont( ofSize: 10, weight: .thin ) ] )
+                
+                r.origin.x += width
+            }
+        }
     }
 }

ColorSet/Interface/Base.lproj/ColorSet.PaletteViewController.xib

@@ -44,16 +44,16 @@
                     </connections>
                 </popUpButton>
                 <scrollView wantsLayer="YES" borderType="none" autohidesScrollers="YES" horizontalLineScroll="10" horizontalPageScroll="10" verticalLineScroll="10" verticalPageScroll="10" usesPredominantAxisScrolling="NO" translatesAutoresizingMaskIntoConstraints="NO" id="4Gb-Td-Ua6">
-                    <rect key="frame" x="20" y="20" width="614" height="382"/>
+                    <rect key="frame" x="20" y="20" width="614" height="370"/>
                     <clipView key="contentView" drawsBackground="NO" id="uSH-1x-Kb0">
-                        <rect key="frame" x="0.0" y="0.0" width="614" height="382"/>
+                        <rect key="frame" x="0.0" y="0.0" width="614" height="370"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <subviews>
                             <collectionView id="Wvb-SF-Ze4">
                                 <rect key="frame" x="0.0" y="0.0" width="614" height="158"/>
                                 <autoresizingMask key="autoresizingMask" widthSizable="YES"/>
-                                <collectionViewFlowLayout key="collectionViewLayout" id="35z-f8-tya">
-                                    <size key="itemSize" width="235" height="150"/>
+                                <collectionViewFlowLayout key="collectionViewLayout" minimumInteritemSpacing="10" minimumLineSpacing="10" id="35z-f8-tya">
+                                    <size key="itemSize" width="225" height="150"/>
                                 </collectionViewFlowLayout>
                                 <color key="primaryBackgroundColor" red="0.0" green="0.0" blue="0.0" alpha="0.0" colorSpace="custom" customColorSpace="sRGB"/>
                                 <connections>
@@ -81,7 +81,7 @@
                 <constraint firstItem="eUV-TI-EqP" firstAttribute="leading" secondItem="c22-O7-iKe" secondAttribute="leading" constant="20" id="bb2-Vp-8RP"/>
                 <constraint firstItem="4Gb-Td-Ua6" firstAttribute="leading" secondItem="c22-O7-iKe" secondAttribute="leading" constant="20" id="h7J-d1-epS"/>
                 <constraint firstAttribute="trailing" secondItem="YZr-ib-2Fa" secondAttribute="trailing" constant="20" id="loG-Hr-8KB"/>
-                <constraint firstItem="4Gb-Td-Ua6" firstAttribute="top" secondItem="eUV-TI-EqP" secondAttribute="bottom" constant="8" id="z8Z-P8-lhg"/>
+                <constraint firstItem="4Gb-Td-Ua6" firstAttribute="top" secondItem="eUV-TI-EqP" secondAttribute="bottom" constant="20" id="z8Z-P8-lhg"/>
             </constraints>
             <point key="canvasLocation" x="223" y="57.5"/>
         </customView>

ColorSetKit/NSColor+ColorSetKit.swift

@@ -159,7 +159,7 @@ import Cocoa
 
         let contrast = ( ( rgb.red * 299 ) + ( rgb.green * 587 ) + ( rgb.blue * 114 ) ) / 1000
 
-        return ( contrast > 123 ) ? darkTextColor : lightTextColor
+        return ( contrast > 150 ) ? darkTextColor : lightTextColor
     }
 
     @objc var hexString: String