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

Fix Group items

Browse source
This commit is contained in:
Samuel Attard 2016-12-16 19:27:54 +11:00 committed by Kevin Sawicki
parent 28d5c8bbde
commit ba3fbc9d1b
1 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
atom/browser/native_window_mac.mm
View file

@ -693,9 +693,11 @@ bool ScopedDisableResize::disable_resize_ = false;
NSMutableArray<NSTouchBarItem*>* generatedItems = [[NSMutableArray alloc] init]; NSMutableArray<NSTouchBarItem*>* generatedItems = [[NSMutableArray alloc] init];
NSMutableArray<NSString*>* identList = [self identifierArrayFromDicts:items]; NSMutableArray<NSString*>* identList = [self identifierArrayFromDicts:items];
for (NSUInteger i = 0; i < [identList count]; i++) { for (NSUInteger i = 0; i < [identList count]; i++) {
NSTouchBarItem* generatedItem = [self makeItemForIdentifier:[identList objectAtIndex:i]]; if ([identList objectAtIndex:i] != NSTouchBarItemIdentifierOtherItemsProxy) {
if (generatedItem) { NSTouchBarItem* generatedItem = [self makeItemForIdentifier:[identList objectAtIndex:i]];
[generatedItems addObject:generatedItem]; if (generatedItem) {
[generatedItems addObject:generatedItem];
}
} }
} }
NSGroupTouchBarItem *groupItem = [NSGroupTouchBarItem groupItemWithIdentifier:identifier items:generatedItems]; NSGroupTouchBarItem *groupItem = [NSGroupTouchBarItem groupItemWithIdentifier:identifier items:generatedItems];