mirror of
https://github.com/electron/electron.git
synced 2026-05-02 03:00:22 -04:00
Use NSString+ANSI on the Menu title
This commit is contained in:
committed by
Cheng Zhao
parent
1d807c552e
commit
d722d20974
@@ -1,6 +1,7 @@
|
||||
// Copyright (c) 2014 GitHub, Inc.
|
||||
// Use of this source code is governed by the MIT license that can be
|
||||
// found in the LICENSE file.
|
||||
#import "atom/browser/mac/NSString+ANSI.h"
|
||||
|
||||
#include "atom/browser/ui/tray_icon_cocoa.h"
|
||||
|
||||
@@ -121,8 +122,12 @@ const CGFloat kVerticalTitleMargin = 2;
|
||||
// Draw title.
|
||||
NSRect titleDrawRect = NSMakeRect(
|
||||
[self iconWidth], -kVerticalTitleMargin, [self titleWidth], thickness);
|
||||
[title_ drawInRect:titleDrawRect
|
||||
withAttributes:[self titleAttributesWithHighlight:highlightContent]];
|
||||
|
||||
NSAttributedString *titleu = [self attributedTitleWithParams:title_];
|
||||
|
||||
[titleu drawInRect:titleDrawRect];
|
||||
//[title_ drawInRect:titleDrawRect
|
||||
// withAttributes:[self titleAttributesWithHighlight:highlightContent]];
|
||||
}
|
||||
}
|
||||
|
||||
@@ -204,8 +209,11 @@ const CGFloat kVerticalTitleMargin = 2;
|
||||
[self setNeedsDisplay:YES];
|
||||
}
|
||||
|
||||
//- (void)setTitle:(NSAttributedString*)title {
|
||||
- (void)setTitle:(NSString*)title {
|
||||
if (title.length > 0) {
|
||||
// title = [self attributedTitleWithParams:title];
|
||||
|
||||
title_.reset([title copy]);
|
||||
} else {
|
||||
title_.reset();
|
||||
@@ -213,6 +221,15 @@ const CGFloat kVerticalTitleMargin = 2;
|
||||
[self updateDimensions];
|
||||
}
|
||||
|
||||
|
||||
- (NSAttributedString*) attributedTitleWithParams:(NSString *)fullTitle {
|
||||
NSDictionary* attributes = @{NSBaselineOffsetAttributeName : @1};
|
||||
NSMutableAttributedString * attributedTitle = [fullTitle attributedStringParsingANSICodes];
|
||||
[attributedTitle addAttributes:attributes range:NSMakeRange(0, attributedTitle.length)];
|
||||
|
||||
return attributedTitle;
|
||||
}
|
||||
|
||||
- (void)setMenuController:(AtomMenuController*)menu {
|
||||
menuController_ = menu;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user