• Many changes to support Dark Mode in macOS 10.14.

• Two subclasses which do not play well with Dark Mode, and whose purpose is better served by other means now available in the Cocoa AppKit, have been deleted.
• Fixed bug which could cause crash in edge case of SSYPopUpTableHeaderCell.
• Added to SSYVectorImages a new style: SSYVectorImageStyleChasingArrowsFilled.
• Property NSImage.name is now added to the *returned* image in SSYVectorImages.

Author: jerrykrinock

SSYAlert.m

@@ -823,7 +823,6 @@ - (void)stealObjectsFromAppleAlerts {
     [image lockFocus] ;
     [[NSGraphicsContext currentContext] setImageInterpolation:NSImageInterpolationHigh];
     CGFloat borderWength = 8.0 ;
-#warning Check this in Dark Mode
     [rawIcon drawInRect:NSMakeRect(
                                    borderWength,
                                    borderWength,
@@ -848,11 +847,11 @@ - (void)stealObjectsFromAppleAlerts {
     badge = [SSYVectorImages imageStyle:SSYVectorImageStyleHexagon
                                  wength:64.0
                                   color:[NSColor yellowColor]
+                           darkModeView:nil // Ignored since we passed in a constant `color`
                           rotateDegrees:90.0
                                   inset:12.0] ;
     [image lockFocus] ;
     [[NSGraphicsContext currentContext] setImageInterpolation:NSImageInterpolationHigh];
-#warning Check this in Dark Mode
     [badge drawInRect:NSMakeRect(
                                  [image size].width / 2,
                                  0,
@@ -875,11 +874,11 @@ - (void)stealObjectsFromAppleAlerts {
     badge = [SSYVectorImages imageStyle:SSYVectorImageStyleHexagon
                                  wength:64.0
                                   color:[NSColor redColor]
+                           darkModeView:nil // Ignored since we passed in a constant `color`
                           rotateDegrees:90.0
                                   inset:12.0] ;
     [image lockFocus] ;
     [[NSGraphicsContext currentContext] setImageInterpolation:NSImageInterpolationHigh];
-#warning Check this in Dark Mode
     [badge drawInRect:NSMakeRect(
                                  [image size].width / 2,
                                  0,

SSYMenuAddButton.h

@@ -66,10 +66,11 @@ - (NSRect)drawAtLeftImage:(NSImage*)image
 			NSRectFill(imageFrame);
 		}
 
- 		[image drawInvertedIfDarkModeInRect:imageFrame
-                                  operation:NSCompositingOperationPlusDarker
-                                   fraction:1.0
-                             appearanceView:controlView];
+        [image drawInRect:imageFrame
+                operation:NSCompositingOperationPlusDarker
+                 fraction:1.0
+         invertIfDarkMode:YES
+                   inView:controlView];
     }
 
 	return cellFrame ;

SSYMenuAddButton.m

@@ -221,7 +221,7 @@ - (void)drawWithFrame:(NSRect)cellFrame
             [path stroke] ;
         }
 
-        [[NSColor blackColor] set] ;
+        [[NSColor controlTextColor] set] ;
 
         if ([self isUserDefined]) {
             // Draw the upper arrow that points up
@@ -246,26 +246,35 @@ - (void)drawWithFrame:(NSRect)cellFrame
         CGFloat xMargin = 1.0 * scaleFactor ;
         CGFloat yMargin = 3.7 * scaleFactor ;
         NSPoint titlePoint = NSMakePoint(NSMinX(cellFrame) + xMargin, yMargin) ;
-        NSAttributedString* attributedTitle ;
+        NSPoint point = cellFrame.origin ;
+        point.x = point.x + [tableView intercellSpacing].width  ;
+        point.y = point.y + [tableView intercellSpacing].height ;
+        NSInteger columnIndex = [tableView columnAtPoint:point];
+        NSFont* font;
+        if (columnIndex != -1) {
+            NSArray <NSTableColumn <SSYPopupTableHeaderSortableColumn>*> * columns = (NSArray <NSTableColumn <SSYPopupTableHeaderSortableColumn>*> *)[tableView tableColumns];
+            NSTableColumn <SSYPopupTableHeaderSortableColumn> * thisColumn = [columns objectAtIndex:columnIndex];
+            font = [thisColumn headerFont];
+        } else {
+            /* This can happen if the window is being resized while loading,
+             but I think it does not matter because we use the system
+             default font anyhow. */
+            font = nil;
+        }
+        NSDictionary* attributes = [NSDictionary dictionaryWithObjectsAndKeys:
+                                    [NSColor controlTextColor], NSForegroundColorAttributeName,
+                                    font, NSFontAttributeName,
+                                    nil] ;
+        NSAttributedString* attributedTitle;
+        NSString* string;
         if ([self fixedNonMenuTitle]) {
-            NSTableView* tableView = [(NSTableHeaderView*)controlView tableView] ;
-            NSPoint point = cellFrame.origin ;
-            point.x = point.x + [tableView intercellSpacing].width  ;
-            point.y = point.y + [tableView intercellSpacing].height ;
-            NSInteger columnIndex = [tableView columnAtPoint:point] ;
-            NSArray <NSTableColumn <SSYPopupTableHeaderSortableColumn>*> * columns = (NSArray <NSTableColumn <SSYPopupTableHeaderSortableColumn>*> *)[tableView tableColumns] ;
-            NSTableColumn <SSYPopupTableHeaderSortableColumn> * thisColumn = [columns objectAtIndex:columnIndex] ;
-            NSFont* font = [thisColumn headerFont] ;
-            NSDictionary* attributes = [NSDictionary dictionaryWithObjectsAndKeys:
-                                        font, NSFontAttributeName,
-                                        nil] ;
-            attributedTitle = [[NSAttributedString alloc] initWithString:[self fixedNonMenuTitle]
-                                                              attributes:attributes] ;
+            string = [self fixedNonMenuTitle];
         }
         else {
-            attributedTitle = [self attributedTitle] ;
-            [attributedTitle retain] ;
+            string = [[self attributedTitle] string];
         }
+        attributedTitle = [[NSAttributedString alloc] initWithString:string
+                                                          attributes:attributes] ;
         NSAttributedString* truncatedTitle = [attributedTitle attributedStringTruncatedToWidth:cellFrame.size.width - xMargin
                                                                                         height:cellFrame.size.height] ;
         [truncatedTitle drawAtPoint:titlePoint] ;

SSYMenuGearButton.h

@@ -44,4 +44,15 @@
 
 - (BOOL)revealTabViewIdentifier:(NSString*)identifier ;
 
+/*!
+ @brief    Returns a special image for certain tab view items
+
+ @details  Subclasses may override this to provide a special image for
+ certain tab view items, for example if you want to use a home-made vector
+ image.  For other tab view items, return nil and the default
+ [NSImage imageNamed:<item-identifier>] will be used.  The default
+ implementation returns nil regardless of the passed-ib identifier.
+ */
+- (NSImage*)specialImageForTabViewIdentifier:(NSString*)identifier;
+
 @end

SSYMenuGearButton.m

@@ -201,7 +201,11 @@ -(NSToolbarItem *) toolbar: (NSToolbar *)toolbar itemForItemIdentifier: (NSStrin
 
 		// Set up a reasonable tooltip, and image   Note, these aren't localized, but you will likely want to localize many of the item's properties 
 		[toolbarItem setToolTip: [self toolTipForIdentifier:itemIdent]];
-		[toolbarItem setImage: [NSImage imageNamed:itemIdent]];
+        NSImage* image = [self specialImageForTabViewIdentifier:itemIdent];
+        if (!image) {
+            image = [NSImage imageNamed:itemIdent];
+        }
+		[toolbarItem setImage:image];
 
 		// Tell the item what message to send when it is clicked 
 		[toolbarItem setTarget: self];
@@ -324,5 +328,9 @@ - (NSString*)localizeString:(NSString*)key {
 	return key ;
 }
 
+- (NSImage*)specialImageForTabViewIdentifier:(NSString*)identifier {
+    return nil;
+}
+
 
 @end

SSYMultiTextFieldCell.m

@@ -712,7 +712,7 @@ - (void)unsafeSetText:(NSString*)text
 		NSFont* font = [NSFont systemFontOfSize:11.0] ;
 		NSDictionary* attributes = [NSDictionary dictionaryWithObjectsAndKeys:
 									font, NSFontAttributeName,
-									[NSColor blueColor], NSForegroundColorAttributeName,
+									[NSColor controlTextColor], NSForegroundColorAttributeName,
 									[NSNumber numberWithInteger:NSUnderlineStyleSingle], NSUnderlineStyleAttributeName,
 									nil] ;				
 		NSAttributedString* title = [[NSAttributedString alloc] initWithString:hyperText

SSYPopUpTableHeaderCell.m

@@ -46,16 +46,19 @@ - (id)initWithFrame:(NSRect)frame
 		[self setStarImage:[SSYVectorImages imageStyle:SSYVectorImageStyleStar
 											    wength:starHeight
 												 color:[NSColor lightGrayColor]
+                                          darkModeView:self
                                          rotateDegrees:0.0
                                                  inset:0.0]] ;
 		[self setStarHighlightedImage:[SSYVectorImages imageStyle:SSYVectorImageStyleStar
 														   wength:starHeight
 															color:[NSColor blueColor]
+                                                     darkModeView:self
                                                     rotateDegrees:0.0
                                                             inset:0.0]] ;
 		[self setRemoveXImage:[SSYVectorImages imageStyle:SSYVectorImageStyleRemoveX
 												   wength:(0.9 * starHeight)
 													color:nil
+                                             darkModeView:self
                                             rotateDegrees:0.0
                                                     inset:0.0]] ;
 		[self setEditable:YES] ;

SSYPrefsWindowController.h

@@ -1,6 +1,5 @@
 #import <Cocoa/Cocoa.h>
 
-
 /*!
  @brief    A toolbar item which has a tristate 'value' attribute,
  and three each additional images, labels and tooltips which 
@@ -14,6 +13,7 @@
 	NSImage* m_onImage ;
 	NSImage* m_offImage ;
 	NSImage* m_disImage ;
+    NSImage* m_backgroundImage;
     NSImage* m_originalImage ;
 	NSString* m_onLabel ;
 	NSString* m_offLabel ;
@@ -36,23 +36,29 @@
 @property (assign) NSInteger value ;
 
 /*!
- @brief    The image that will be displayed when the receiver's 
- value is set to NSOnState.
+ @brief    The image that will be displayed when the receiver's  value is
+ NSOnState.
 */
 @property (retain) NSImage* onImage ;
 
 /*!
- @brief    The image that will be displayed when the receiver's
- value is set to NSOnState.
+ @brief    The image that will be displayed when the receiver's value is
+ NSOnState.
  */
 @property (retain) NSImage* offImage ;
 
 /*!
- @brief    The image that will be displayed when the receiver's
- value is set to NSMixedState.
+ @brief    The image that will be displayed when the receiver's value is
+ NSMixedState.
  */
 @property (retain) NSImage* disImage ;
 
+/*!
+ @brief    An image that will always be displayed regardless of the  receiver's
+ value.
+ */
+@property (retain) NSImage* backgroundImage;
+
 /*!
  @brief    The string that will be displayed under the button
  when the receiver's value is set to NSOnState.  This value
@@ -116,3 +122,10 @@
 @property (assign) NSTimeInterval flashDuration ;
 
 @end
+
+@interface SSYToolbarButtonView : NSView
+
+@property (weak) SSYToolbarButton* toolbarItem;
+
+@end
+