Improvements to the menubar icon

the code is a lot simpler and it draws the icon crisper. also changed
the selected icon to white.

Author: elasticthreads

AppController.m

@@ -1138,14 +1138,12 @@ - (void)applicationDidBecomeActive:(NSNotification *)aNotification {
 
     if ([notationController currentNoteStorageFormat] != SingleDatabaseFormat)
 		[notationController performSelector:@selector(synchronizeNotesFromDirectory) withObject:nil afterDelay:0.0];
-	[cView setActiveIcon:self];
 	[notationController updateDateStringsIfNecessary];
 }
 
 - (void)applicationWillResignActive:(NSNotification *)aNotification {
 	//sync note files when switching apps so user doesn't have to guess when they'll be updated
 	[notationController synchronizeNoteChanges:nil];
-	[cView setInactiveIcon:self];
     [[NSNotificationCenter defaultCenter] postNotificationName:@"ModTimersShouldReset" object:nil];
 
 }
@@ -2814,9 +2812,11 @@ - (IBAction)setLCColorScheme:(id)sender{
         userScheme=1;
         [[NSUserDefaults standardUserDefaults] setInteger:userScheme forKey:@"ColorScheme"];
         //	[self setForegrndColor:[NSColor colorWithDeviceRed:0.405 green:0.405 blue:0.405 alpha:1.0]];
-        [self setForegrndColor:[NSColor colorWithDeviceWhite:0.2430 alpha:1.0]];
+        [self setForegrndColor:[NSColor colorWithCalibratedRed:0.2430 green:0.2430 blue:0.2430 alpha:1.0]];
+        
         //[self setBackgrndColor:[NSColor colorWithDeviceWhite:0.970 alpha:1.0]];
-        [self setBackgrndColor:[NSColor colorWithDeviceWhite:0.902 alpha:1.0]];
+//        [NSColor colorWithCalibratedRed:0.902 green:0.902 blue:0.902 alpha:1.0]
+        [self setBackgrndColor:[NSColor colorWithCalibratedRed:0.902 green:0.902 blue:0.902 alpha:1.0]];
         NSMenu *mainM = [NSApp mainMenu];
         NSMenu *viewM = [[mainM itemWithTitle:@"View"] submenu];
         mainM = [[viewM itemWithTitle:@"Color Schemes"] submenu];
@@ -3301,15 +3301,15 @@ - (void)hideDockIconAfterDelay{
         [self performSelector:@selector(hideDockIcon) withObject:nil afterDelay:0.22];
     }
 
-    - (void)setUpStatusBarItem{
-        float width = 25.0f;
-        CGFloat height = [[NSStatusBar systemStatusBar] thickness];
-        NSRect viewFrame = NSMakeRect(0.0f, 0.0f, width, height);
-        statusItem = [[[NSStatusBar systemStatusBar] statusItemWithLength:width] retain];
-        cView = [[[StatusItemView alloc] initWithFrame:viewFrame controller:self] autorelease];
-        [statusItem setView:cView];
-    }
+- (void)setUpStatusBarItem{
+    NSRect viewFrame = NSMakeRect(0.0f, 0.0f, 24.0f,[[NSStatusBar systemStatusBar] thickness]);
+    statusItem = [[[NSStatusBar systemStatusBar] statusItemWithLength:24.0f] retain];
+    cView = [[[StatusItemView alloc] initWithFrame:viewFrame] autorelease];
+    [statusItem setView:cView];
 
+    [[NSNotificationCenter defaultCenter]postNotificationName:@"StatusBarMenuIsAwake" object:statBarMenu];
+}
+
     - (void)toggleStatusItem:(NSNotification *)notification{
         if (!statusItem) {
             [self setUpStatusBarItem];

LinkingEditor.m

@@ -332,7 +332,7 @@ - (NSColor*)_linkColorForForegroundColor:(NSColor*)fgColor backgroundColor:(NSCo
 - (NSColor*)_selectionColorForForegroundColor:(NSColor*)fgColor backgroundColor:(NSColor*)bgColor {
 	fgColor = [fgColor colorUsingColorSpaceName:NSCalibratedRGBColorSpace];
 	bgColor = [bgColor colorUsingColorSpaceName:NSCalibratedRGBColorSpace];
-
+    
 	NSColor *proposedBlend = [fgColor blendedColorWithFraction:0.5 ofColor:bgColor];
 	NSColor *defaultColor = [[NSColor selectedTextBackgroundColor] colorUsingColorSpaceName:NSCalibratedRGBColorSpace];
 
@@ -343,12 +343,11 @@ - (NSColor*)_selectionColorForForegroundColor:(NSColor*)fgColor backgroundColor:
 	//but the selection-color-difference from the foreground text needs to be great enough as well,
 	//and the proposed-color-difference from the foreground can't be too poor
 	//this heuristic chooses all the system-highlight colors in default fg/bg combinations and fg/bg blends in all others
-	
-//	NSLog(@"fg diff of proposed: %g fg diff of sel: %g", fgDiff, fgSelDiff);
-	if ((_perceptualDarkness(fgColor) > _perceptualDarkness(defaultColor) && 
-		 _perceptualDarkness(defaultColor) > _perceptualDarkness(bgColor) && fgSelDiff > 300.0) || fgDiff < 170.0)
+    
+	if ((_perceptualDarkness(fgColor) > _perceptualDarkness(defaultColor) &&
+		 _perceptualDarkness(defaultColor) > (_perceptualDarkness(bgColor)+0.22) && fgSelDiff > 300.0) || fgDiff < 160.0){
 		return defaultColor;
-	
+	}
 	//amplify the background balance after testing
 	return [fgColor blendedColorWithFraction:0.69 ofColor:bgColor];
 }

Notation.xcodeproj/project.pbxproj

@@ -140,6 +140,7 @@
 		5C4B35421307220E00014119 /* TransparentScrollerSlotVerticalFill.tif in Resources */ = {isa = PBXBuildFile; fileRef = 5C4B353A1307220E00014119 /* TransparentScrollerSlotVerticalFill.tif */; };
 		5C4B356A1307225000014119 /* ETTransparentScroller.m in Sources */ = {isa = PBXBuildFile; fileRef = 5C4B35691307225000014119 /* ETTransparentScroller.m */; };
 		5C84319114229D810020E5A7 /* PassphraseRetriever.xib in Resources */ = {isa = PBXBuildFile; fileRef = 5C84319314229D810020E5A7 /* PassphraseRetriever.xib */; };
+		5C91A1861723079B006BF757 /* nvMenuW.png in Resources */ = {isa = PBXBuildFile; fileRef = 5C91A1851723079B006BF757 /* nvMenuW.png */; };
 		5C94376F132A0C9E00B08B80 /* greyscrollervertbottom3.tif in Resources */ = {isa = PBXBuildFile; fileRef = 5C94376C132A0C9D00B08B80 /* greyscrollervertbottom3.tif */; };
 		5C943771132A0C9E00B08B80 /* greyscrollerverttop3.tif in Resources */ = {isa = PBXBuildFile; fileRef = 5C94376E132A0C9D00B08B80 /* greyscrollerverttop3.tif */; };
 		5C96F4FF131C2F9500A2E4AC /* TabClose_Front_Pressed.tif in Resources */ = {isa = PBXBuildFile; fileRef = 5C96F4FC131C2F9500A2E4AC /* TabClose_Front_Pressed.tif */; };
@@ -629,6 +630,7 @@
 		5C84319814229D940020E5A7 /* it */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = it; path = it.lproj/PassphraseRetriever.xib; sourceTree = "<group>"; };
 		5C84319914229D940020E5A7 /* zh */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = zh; path = zh.lproj/PassphraseRetriever.xib; sourceTree = "<group>"; };
 		5C8FA1F416F8A91800A2C6D7 /* SimperiumConfig.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SimperiumConfig.h; sourceTree = "<group>"; };
+		5C91A1851723079B006BF757 /* nvMenuW.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = nvMenuW.png; sourceTree = "<group>"; };
 		5C94376C132A0C9D00B08B80 /* greyscrollervertbottom3.tif */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; path = greyscrollervertbottom3.tif; sourceTree = "<group>"; };
 		5C94376D132A0C9D00B08B80 /* greyscrollervertfill3.tif */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; path = greyscrollervertfill3.tif; sourceTree = "<group>"; };
 		5C94376E132A0C9D00B08B80 /* greyscrollerverttop3.tif */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; path = greyscrollerverttop3.tif; sourceTree = "<group>"; };
@@ -1138,6 +1140,7 @@
 				5C2CC189134989D7006FFE56 /* nvMenuDark.png */,
 				5C2CC182134989A8006FFE56 /* nvMenu.png */,
 				5C2CC183134989A8006FFE56 /* nvMenuC.png */,
+				5C91A1851723079B006BF757 /* nvMenuW.png */,
 				93A158BD133C497400E1E7DA /* Notality.icns */,
 				5C94376C132A0C9D00B08B80 /* greyscrollervertbottom3.tif */,
 				5C94376D132A0C9D00B08B80 /* greyscrollervertfill3.tif */,
@@ -1652,6 +1655,7 @@
 				B683A0DC16F1CDA600564A1D /* [email protected] in Resources */,
 				B683A0DD16F1CDA600564A1D /* [email protected] in Resources */,
 				B683A0DE16F1CDA600564A1D /* [email protected] in Resources */,
+				5C91A1861723079B006BF757 /* nvMenuW.png in Resources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};

StatusItemView.h

@@ -8,17 +8,15 @@
 
 #import <Cocoa/Cocoa.h>
 
-@class AppController;
+
+typedef enum { DarkMenuIcon, SelectedMenuIcon } StatusIconType;
+
 @interface StatusItemView : NSView {
-    __weak AppController *controller;
-    BOOL clicked;
+//    BOOL clicked;
+    StatusIconType sbIconType;
 }
 
-//@property (nonatomic,readwrite,assign) BOOL clicked;
 
-- (id)initWithFrame:(NSRect)frame controller:(AppController *)ctrlr;
-//- (void)setClicked:(BOOL)inBool;
-- (void)setInactiveIcon:(id)sender;
-- (void)setActiveIcon:(id)sender;
+@property(readwrite,nonatomic)StatusIconType sbIconType;
 
 @end

StatusItemView.m

@@ -7,92 +7,78 @@
 //
 
 #import "StatusItemView.h"
-#import "AppController.h"
 
 NSString *imageName = @"nvMenuDark";
+static NSRect itemRect;
 
-@implementation StatusItemView
 
+@implementation StatusItemView
 
-- (id)initWithFrame:(NSRect)frame controller:(AppController *)ctrlr
-{
-    if (self = [super initWithFrame:frame]) {
-        controller = ctrlr; // deliberately weak reference.
-    }    
-    return self;
-}
+@synthesize sbIconType;
 
 
-- (void)dealloc
-{
-    controller = nil;
-    [super dealloc];
+- (id)initWithFrame:(NSRect)frameRect{
+    if ((self=[super initWithFrame:frameRect])) {
+        itemRect=NSMakeRect(4.0, 3.0, 16.0, 16.0);
+        self.sbIconType=DarkMenuIcon;
+    }
+    return self;
 }
 
 - (void)drawRect:(NSRect)rect {
-	if (clicked) {
-        imageName=@"nvMenuC";
-        [[NSColor selectedMenuItemColor] set];
-		NSRectFill(rect);
+    CGFloat fract=1.0;
+	if (sbIconType==SelectedMenuIcon) {
+        fract=0.87;
+        [[NSColor selectedMenuItemColor] setFill];
     }else {
-        if ([NSApp isActive]) {
-            imageName = @"nvMenuDark";
-        }else{
-        imageName = @"nvMenuDark";
-        }
-		[[NSColor clearColor] set];
-        NSRectFill(rect);
+		[[NSColor clearColor] setFill];
 	}
-	NSBundle *bundle = [NSBundle bundleForClass:[self class]];
-	NSString *path = [bundle pathForResource:imageName ofType:@"png"];
-	NSImage *menuIcon = [[NSImage alloc] initWithContentsOfFile:path];
-	NSSize msgSize = [menuIcon size];
-    NSRect msgRect = NSMakeRect(0, 0, msgSize.width, msgSize.height);
-    msgRect.origin.x = ([self frame].size.width - msgSize.width)/2;
-    msgRect.origin.y = ([self frame].size.height - msgSize.height)/2;
-	[menuIcon drawInRect:msgRect fromRect:NSZeroRect operation: NSCompositeSourceOver fraction:1.0];
-	[menuIcon autorelease];
+    NSRectFill(rect);
+    
+	[[NSImage imageNamed:imageName] drawInRect:itemRect fromRect:NSZeroRect operation: NSCompositeSourceOver fraction:fract];
 }
 
+
 - (void)mouseDown:(NSEvent *)event
 {
-	clicked = YES;
-	[self setNeedsDisplay:YES];
+    self.sbIconType=SelectedMenuIcon;
     NSUInteger flags=[event modifierFlags];   
     if (((flags&NSDeviceIndependentModifierFlagsMask)==(flags&NSControlKeyMask))&&((flags&NSDeviceIndependentModifierFlagsMask)>0)) {
         [[NSNotificationCenter defaultCenter]postNotificationName:@"StatusItemMenuShouldDrop" object:nil];
-        clicked = NO;
-        [self setNeedsDisplay:YES];
+        self.sbIconType=DarkMenuIcon;
     }else{
         [[NSNotificationCenter defaultCenter]postNotificationName:@"NVShouldActivate" object:self];
     }
 }
 
 - (void)mouseUp:(NSEvent *)event {
-    
-//    [[NSNotificationCenter defaultCenter] postNotificationName:@"ModTimersShouldReset" object:nil];
-	clicked = NO;	
-	[self setNeedsDisplay:YES];
-	[self viewWillDraw];
+    self.sbIconType=DarkMenuIcon;
+//	[self viewWillDraw];
 }
 
 - (void)rightMouseDown:(NSEvent *)event {
-	clicked = YES;
-	[self setNeedsDisplay:YES];
+    self.sbIconType=SelectedMenuIcon;
      [[NSNotificationCenter defaultCenter]postNotificationName:@"StatusItemMenuShouldDrop" object:nil];
-//	[controller toggleAttachedMenu:self];	
-    clicked = NO;
-    [self setNeedsDisplay:YES];
+    self.sbIconType=DarkMenuIcon;
 }
 
-- (void)setInactiveIcon:(id)sender{
-	imageName = @"nvMenuDark";
-	[self setNeedsDisplay:YES];
-}
-
-- (void)setActiveIcon:(id)sender{
-    imageName=@"nvMenuDark";;
-	[self setNeedsDisplay:YES];
+- (void)setSbIconType:(StatusIconType)type{
+    if (sbIconType!=type) {
+        switch (type) {
+            case DarkMenuIcon:
+                imageName=@"nvMenuDark";
+                break;
+            case SelectedMenuIcon:
+                imageName=@"nvMenuW";
+                break;
+                
+            default:
+                imageName=@"nvMenuDark";
+                break;
+        }
+        sbIconType=type;
+        [self setNeedsDisplay:YES];
+    }
 }
 
 @end