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

Few memory and scope tweaks

Browse source
This commit is contained in:
Kevin Sawicki 2017-02-27 16:07:19 -08:00
parent b16d649819
commit 1b5149ae7a
1 changed files with 8 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

22
atom/browser/native_window_mac.mm
View file

@ -363,7 +363,6 @@ bool ScopedDisableResize::disable_resize_ = false;
@end @end
@implementation AtomNSWindow @implementation AtomNSWindow
NSMutableArray* bar_items_ = [[NSMutableArray alloc] init];
std::map<std::string, mate::PersistentDictionary> item_id_map; std::map<std::string, mate::PersistentDictionary> item_id_map;
std::map<std::string, NSTouchBarItem*> item_map; std::map<std::string, NSTouchBarItem*> item_map;
@ -376,7 +375,6 @@ bool ScopedDisableResize::disable_resize_ = false;
} }
- (void)resetTouchBar { - (void)resetTouchBar {
bar_items_ = [[NSMutableArray alloc] init];
self.touchBar = nil; self.touchBar = nil;
} }
@ -432,27 +430,25 @@ bool ScopedDisableResize::disable_resize_ = false;
} }
- (void)reloadTouchBar { - (void)reloadTouchBar {
std::map<std::string, mate::PersistentDictionary> new_map; item_id_map.clear();
item_id_map = new_map;
bar_items_ = [self identifierArrayFromDicts:shell_->GetTouchBarItems()];
self.touchBar = nil; self.touchBar = nil;
} }
- (NSTouchBar*)makeTouchBar { - (NSTouchBar*)makeTouchBar {
return [self touchBarFromMutatableArray:bar_items_]; NSMutableArray* item_identifiers =
[self identifierArrayFromDicts:shell_->GetTouchBarItems()];
return [self touchBarFromMutatableArray:item_identifiers];
} }
- (NSTouchBar*)touchBarFromMutatableArray:(NSMutableArray*)items { - (NSTouchBar*)touchBarFromMutatableArray:(NSMutableArray*)items {
NSTouchBar* bar = [[NSClassFromString(@"NSTouchBar") alloc] init]; NSTouchBar* bar = [[NSClassFromString(@"NSTouchBar") alloc] init];
bar.delegate = self; bar.delegate = self;
bar.defaultItemIdentifiers = items;
bar.defaultItemIdentifiers = [items copy];
return bar; return bar;
} }
- (void)buttonAction:(id)sender { - (void)buttonAction:(id)sender {
NSString* item_id = [NSString stringWithFormat:@"com.electron.tb.button.%d", (int)((NSButton *)sender).tag]; NSString* item_id = [NSString stringWithFormat:@"%@.%d", ButtonIdentifier, (int)((NSButton *)sender).tag];
shell_->NotifyTouchBarItemInteraction("button", { std::string([item_id UTF8String]) }); shell_->NotifyTouchBarItemInteraction("button", { std::string([item_id UTF8String]) });
} }
@ -469,9 +465,7 @@ bool ScopedDisableResize::disable_resize_ = false;
} }
- (NSString*)idFromIdentifier:(NSString*)identifier withPrefix:(NSString*)prefix { - (NSString*)idFromIdentifier:(NSString*)identifier withPrefix:(NSString*)prefix {
NSString *idCopy = [identifier copy]; return [identifier substringFromIndex:[prefix length]];
idCopy = [identifier substringFromIndex:[prefix length]];
return idCopy;
} }
- (bool)hasTBDict:(std::string)id { - (bool)hasTBDict:(std::string)id {
@ -497,7 +491,7 @@ bool ScopedDisableResize::disable_resize_ = false;
std::string labelColor; std::string labelColor;
if (dict.Get("labelColor", &labelColor)) { if (dict.Get("labelColor", &labelColor)) {
NSMutableAttributedString *attrTitle = [[NSMutableAttributedString alloc] initWithString:[NSString stringWithUTF8String:label.c_str()]]; NSMutableAttributedString *attrTitle = [[[NSMutableAttributedString alloc] initWithString:[NSString stringWithUTF8String:label.c_str()]] autorelease];
NSUInteger len = [attrTitle length]; NSUInteger len = [attrTitle length];
NSRange range = NSMakeRange(0, len); NSRange range = NSMakeRange(0, len);
[attrTitle addAttribute:NSForegroundColorAttributeName value:[self colorFromHexColorString:[NSString stringWithUTF8String:labelColor.c_str()]] range:range]; [attrTitle addAttribute:NSForegroundColorAttributeName value:[self colorFromHexColorString:[NSString stringWithUTF8String:labelColor.c_str()]] range:range];