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

Clean

Browse source
This commit is contained in:
Sebastien Bramille 2017-11-13 11:01:14 +00:00 committed by Cheng Zhao
parent 85f254316c
commit 6a1cfafbd8
2 changed files with 7 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
atom/browser/ui/cocoa/NSString+ANSI.mm
View file

@ -108,8 +108,6 @@
@implementation NSString (ANSI)
- (BOOL)containsANSICodes {
NSLog(@"%lu", [self rangeOfString:@"\\033["].location);
NSLog(@"%d", [self rangeOfString:@"\\033["].location != NSNotFound);
return [self rangeOfString:@"\\033["].location != NSNotFound;
}

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

@ -27,6 +27,7 @@ const CGFloat kVerticalTitleMargin = 2;
atom::TrayIcon::HighlightMode highlight_mode_;
BOOL forceHighlight_;
BOOL inMouseEventSequence_;
BOOL ANSI_;
base::scoped_nsobject<NSImage> image_;
base::scoped_nsobject<NSImage> alternateImage_;
base::scoped_nsobject<NSString> title_;
@ -125,20 +126,7 @@ const CGFloat kVerticalTitleMargin = 2;
NSAttributedString* titleParsed = [self attributedTitleWithParams:title_];
NSLog(@"--------------------------");
NSLog(@"--------------------------");
NSLog(@"%@", titleParsed);
NSLog(@"--------------------------");
NSLog(@"--------------------------");
//[titleu drawInRect:titleDrawRect];
[titleParsed drawInRect:titleDrawRect];
//BOOL highlight = false;
//NSString* test = @"je suis un test";
//[test drawInRect:titleDrawRect
// withAttributes:[self titleAttributesWithHighlight:highlight]];
}
}
@ -183,6 +171,10 @@ NSLog(@"--------------------------");
- (CGFloat)titleWidth {
if (!title_)
return 0;
if (ANSI_)
return [[title_ attributedStringParsingANSICodes] size].width + 8;
base::scoped_nsobject<NSAttributedString> attributes(
[[NSAttributedString alloc] initWithString:title_
attributes:[self titleAttributes]]);
@ -219,14 +211,10 @@ NSLog(@"--------------------------");
[self setNeedsDisplay:YES];
}
//- (void)setTitle:(NSAttributedString*)title {
- (void)setTitle:(NSString*)title {
if (title.length > 0) {
//NSAttributedString* titleParsed = [self attributedTitleWithParams:title];
//NSLog(@"%@", title_);
//NSLog(@"%@", titleParsed);
title_.reset([title copy]);
ANSI_ = [title containsANSICodes];
} else {
title_.reset();
}
@ -238,20 +226,13 @@ NSLog(@"--------------------------");
fullTitle = [fullTitle stringByTrimmingCharactersInSet:NSCharacterSet.whitespaceCharacterSet];
NSString * title = fullTitle;
//NSDictionary* attributes = @{NSFontAttributeName: font, NSBaselineOffsetAttributeName : @1};
BOOL highlight = [self shouldHighlight];
BOOL highlightContent = highlight | [self isDarkMode];
NSDictionary* attributes = [self titleAttributesWithHighlight:highlightContent];
BOOL parseANSI = [fullTitle containsANSICodes];
NSLog(@"%@", fullTitle);
NSLog(@"%d", parseANSI);
NSMutableAttributedString * attributedTitle = [NSMutableAttributedString.alloc initWithString:title attributes:attributes];
if (parseANSI) {
if (ANSI_) {
attributedTitle = [title attributedStringParsingANSICodes];
NSLog(@"has ANSI code");
NSLog(@"%lu", title.length);
[attributedTitle addAttributes:attributes range:NSMakeRange(0, attributedTitle.length)];
NSLog(@"%lu", attributedTitle.length);
return attributedTitle;
}