Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Use monospacedDigitSystemFontOfSize on OS X 10.11+ #148

Merged
merged 1 commit into from
Jan 8, 2016
Merged

Use monospacedDigitSystemFontOfSize on OS X 10.11+ #148

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 10 additions & 3 deletions App/BitBar/Plugin.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,9 +75,16 @@ - (NSAttributedString*) attributedTitleWithParams:(NSDictionary *)params {
NSString * title = truncLength < titleLength ? [[fullTitle substringToIndex:truncLength] stringByAppendingString:@"…"] : fullTitle;

CGFloat size = params[@"size"] ? [params[@"size"] floatValue] : 14;
NSFont * font = [self isFontValid:params[@"font"]] ? [NSFont fontWithName:params[@"font"] size:size]
: [NSFont menuFontOfSize:size]
?: [NSFont menuFontOfSize:size];
NSFont * font;
if ([NSFont respondsToSelector:@selector(monospacedDigitSystemFontOfSize:weight:)]) {
font = [self isFontValid:params[@"font"]] ? [NSFont fontWithName:params[@"font"] size:size]
: [NSFont monospacedDigitSystemFontOfSize:size weight:NSFontWeightRegular]
?: [NSFont monospacedDigitSystemFontOfSize:size weight:NSFontWeightRegular];
} else {
font = [self isFontValid:params[@"font"]] ? [NSFont fontWithName:params[@"font"] size:size]
: [NSFont menuFontOfSize:size]
?: [NSFont menuFontOfSize:size];
}
NSColor * fgColor;
NSMutableAttributedString * attributedTitle = [NSMutableAttributedString.alloc initWithString:title attributes:@{NSFontAttributeName: font}];
if (!params[@"color"]) return attributedTitle;
Expand Down