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

fix: make TouchBarPopover and TouchBarGroup work (#27901)

Browse source 
* fix: use correct `orderedItem` touchbar property

* fix: correct parent in touchbar group and popover

* fix: preserve property hook order
This commit is contained in:
Erick Zhao 2021-03-01 13:34:00 -08:00 • committed by GitHub
parent e5a9a1ebd7
commit 2d0ad0b96a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

6
lib/browser/api/touch-bar.ts
View file

@ -7,8 +7,8 @@ const hiddenProperties = Symbol('hidden touch bar props');
const extendConstructHook = (target: any, hook: Function) => { const extendConstructHook = (target: any, hook: Function) => {
const existingHook = target._hook; const existingHook = target._hook;
target._hook = function () { target._hook = function () {
hook.call(this);
if (existingHook) existingHook.call(this); if (existingHook) existingHook.call(this);
hook.call(this);
}; };
}; };
@ -135,7 +135,7 @@ class TouchBarGroup extends TouchBarItem<Electron.TouchBarGroupConstructorOption
} }
} }
for (const item of newChild.orderedItems) { for (const item of newChild.orderedItems) {
item._addParent(item); item._addParent(self);
} }
}) })
child!: TouchBar; child!: TouchBar;
@ -179,7 +179,7 @@ class TouchBarPopover extends TouchBarItem<Electron.TouchBarPopoverConstructorOp
} }
} }
for (const item of newChild.orderedItems) { for (const item of newChild.orderedItems) {
item._addParent(item); item._addParent(self);
} }
}) })
child!: TouchBar; child!: TouchBar;

6
shell/browser/ui/cocoa/electron_touch_bar.mm
View file

@ -551,7 +551,7 @@ static NSString* const ImageScrubberItemIdentifier = @"scrubber.image.item";
gin_helper::PersistentDictionary child; gin_helper::PersistentDictionary child;
std::vector<gin_helper::PersistentDictionary> items; std::vector<gin_helper::PersistentDictionary> items;
if (settings.Get("child", &child) && child.Get("ordereredItems", &items)) { if (settings.Get("child", &child) && child.Get("orderedItems", &items)) {
item.popoverTouchBar = item.popoverTouchBar =
[self touchBarFromItemIdentifiers:[self identifiersFromSettings:items]]; [self touchBarFromItemIdentifiers:[self identifiersFromSettings:items]];
} }
@ -572,7 +572,7 @@ static NSString* const ImageScrubberItemIdentifier = @"scrubber.image.item";
if (!settings.Get("child", &child)) if (!settings.Get("child", &child))
return nil; return nil;
std::vector<gin_helper::PersistentDictionary> items; std::vector<gin_helper::PersistentDictionary> items;
if (!child.Get("ordereredItems", &items)) if (!child.Get("orderedItems", &items))
return nil; return nil;
NSMutableArray* generatedItems = [NSMutableArray array]; NSMutableArray* generatedItems = [NSMutableArray array];
@ -601,7 +601,7 @@ static NSString* const ImageScrubberItemIdentifier = @"scrubber.image.item";
if (!settings.Get("child", &child)) if (!settings.Get("child", &child))
return; return;
std::vector<gin_helper::PersistentDictionary> items; std::vector<gin_helper::PersistentDictionary> items;
if (!child.Get("ordereredItems", &items)) if (!child.Get("orderedItems", &items))
return; return;
item.groupTouchBar = item.groupTouchBar =