Skip to content

Commit 368659b

Browse files
committed
Merge pull request #88 from blazeworx/yosemite-dark-mode
Added Yosemite OSX Dark Mode menu icon support.
2 parents c59b041 + c51588c commit 368659b

File tree

2 files changed

+20
-2
lines changed

2 files changed

+20
-2
lines changed

Shuttle/AppDelegate.h

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,9 @@
1010
IBOutlet NSMenu *menu;
1111
IBOutlet NSArrayController *arrayController;
1212

13+
NSImage *regularIcon;
14+
NSImage *altIcon;
15+
1316
NSStatusItem *statusItem;
1417
NSString *shuttleConfigFile;
1518

Shuttle/AppDelegate.m

Lines changed: 17 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,13 +19,28 @@ - (void) awakeFromNib {
1919

2020
// Load the menu content
2121
// [self loadMenu];
22+
23+
// Define Icons
24+
regularIcon = [NSImage imageNamed:@"StatusIcon"];
25+
altIcon = [NSImage imageNamed:@"StatusIconAlt"];
26+
27+
// Check for AppKit Version, add support for darkmode if > 10.9
28+
BOOL oldAppKitVersion = (floor(NSAppKitVersionNumber) <= NSAppKitVersionNumber10_9);
29+
30+
if (!oldAppKitVersion)
31+
{
32+
// 10.10 or higher, add support to icon for auto detection of Regular/Dark mode
33+
[regularIcon setTemplate:YES];
34+
[altIcon setTemplate:YES];
35+
}
2236

2337
// Create the status bar item
2438
statusItem = [[NSStatusBar systemStatusBar] statusItemWithLength:25.0];
39+
2540
[statusItem setMenu:menu];
2641
[statusItem setHighlightMode:YES];
27-
[statusItem setImage:[NSImage imageNamed:@"StatusIcon"]];
28-
[statusItem setAlternateImage:[NSImage imageNamed:@"StatusIconAlt"]];
42+
[statusItem setImage: regularIcon];
43+
[statusItem setAlternateImage: altIcon];
2944

3045
launchAtLoginController = [[LaunchAtLoginController alloc] init];
3146

0 commit comments

Comments
 (0)