github/electron
1
1
Fork 0
mirror of https://github.com/electron/electron.git synced 2026-01-23 22:38:18 -05:00
Code Issues Packages Projects Releases Wiki Activity

Fix style issues

Browse Source
This commit is contained in:
Cheng Zhao
2016-04-07 13:58:51 +09:00
parent e0ee60f290
commit 548febfa4c
1 changed files with 9 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
atom/browser/ui/tray_icon_cocoa.mm
View File

@@ -78,18 +78,18 @@ const CGFloat kVerticalTitleMargin = 2;
BOOL highlightContent = highlight | [self isDarkMode];
CGFloat thickness = [[statusItem_ statusBar] thickness];
// Draw the system bar background
// Draw the system bar background.
[statusItem_ drawStatusBarBackgroundInRect:self.bounds withHighlight:highlight];
// Determine which image to use
NSImage * image = image_.get();
// Determine which image to use.
NSImage* image = image_.get();
if (inMouseEventSequence_ && alternateImage_) {
image = alternateImage_.get();
}
// Apply the higlight color if the image is a template image. When this moves
// to using the new [NSStatusItem button] API, this should work automagically.
if ([image isTemplate] == YES) {
NSImage * imageWithColor = [image copy] autorelease];
NSImage* imageWithColor = [[image copy] autorelease];
[imageWithColor lockFocus];
[[self colorWithHighlight: highlightContent] set];
CGRect imageBounds = CGRectMake(0,0, image.size.width, image.size.height);
@@ -162,17 +162,16 @@ const CGFloat kVerticalTitleMargin = 2;
return [attributes size].width;
}
- (NSColor*)colorWithHighlight:(BOOL)highlight
{
- (NSColor*)colorWithHighlight:(BOOL)highlight {
return highlight ?
[NSColor whiteColor] :
[NSColor colorWithRed:0.265625 green:0.25390625 blue:0.234375 alpha:1.0];
[NSColor whiteColor] :
[NSColor colorWithRed:0.265625 green:0.25390625 blue:0.234375 alpha:1.0];
}
- (NSDictionary*)titleAttributesWithHighlight:(BOOL)highlight {
return @{
NSFontAttributeName: [NSFont menuBarFontOfSize:0],
NSForegroundColorAttributeName: [self colorWithHighlight: highlight]
NSFontAttributeName:[NSFont menuBarFontOfSize:0],
NSForegroundColorAttributeName:[self colorWithHighlight: highlight]
};
}