github/electron
1
1
Fork 0
mirror of https://github.com/electron/electron.git synced 2026-01-26 15:58:07 -05:00
Code Issues Packages Projects Releases Wiki Activity

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
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<NSString*>* identList = [self identifierArrayFromDicts:items];
for (NSUInteger i = 0; i < [identList count]; i++) {
NSTouchBarItem* generatedItem = [self makeItemForIdentifier:[identList objectAtIndex:i]];
if (generatedItem) {
[generatedItems addObject:generatedItem];
if ([identList objectAtIndex:i] != NSTouchBarItemIdentifierOtherItemsProxy) {
NSTouchBarItem* generatedItem = [self makeItemForIdentifier:[identList objectAtIndex:i]];
if (generatedItem) {
[generatedItems addObject:generatedItem];
}
}
}
NSGroupTouchBarItem *groupItem = [NSGroupTouchBarItem groupItemWithIdentifier:identifier items:generatedItems];