mirrors/electron
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Support images larger than self.bounds

Browse source
This commit is contained in:
Ben Gotow 2016-03-26 19:40:52 -07:00 committed by Cheng Zhao
parent f9644463a9
commit 91457fe739
1 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
atom/browser/ui/tray_icon_cocoa.mm
View file

@ -86,24 +86,24 @@ const CGFloat kVerticalTitleMargin = 2;
if (inMouseEventSequence_ && alternateImage_) { if (inMouseEventSequence_ && alternateImage_) {
image = alternateImage_.get(); image = alternateImage_.get();
} }
// Apply the higlight color if the image is a template image. When this moves // 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. // to using the new [NSStatusItem button] API, this should work automagically.
if ([image isTemplate] == YES) { if ([image isTemplate] == YES) {
NSImage * imageWithColor = [image copy]; NSImage * imageWithColor = [image copy];
[imageWithColor lockFocus]; [imageWithColor lockFocus];
[[self colorWithHighlight: highlightContent] set]; [[self colorWithHighlight: highlightContent] set];
NSRectFillUsingOperation(self.bounds, NSCompositeSourceAtop); CGRect imageBounds = CGRectMake(0,0, image.size.width, image.size.height);
NSRectFillUsingOperation(imageBounds, NSCompositeSourceAtop);
[imageWithColor unlockFocus]; [imageWithColor unlockFocus];
image = imageWithColor; image = imageWithColor;
} }
// Draw the image // Draw the image
[image drawInRect: CGRectMake( [image drawInRect: CGRectMake(
roundf(([self iconWidth] - [image size].width) / 2), roundf(([self iconWidth] - image.size.width) / 2),
roundf((thickness - [image size].height) / 2), roundf((thickness - image.size.height) / 2),
[image size].width, image.size.width,
[image size].height image.size.height
)]; )];
if (title_) { if (title_) {