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

Add live popover icon property

Browse source
This commit is contained in:
Kevin Sawicki 2017-03-02 13:37:34 -08:00
commit ce12dcd3b4
2 changed files with 4 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

5
atom/browser/ui/cocoa/atom_touch_bar.mm
View file

@ -333,10 +333,11 @@ static NSTouchBarItemIdentifier SliderIdentifier = @"com.electron.touchbar.slide
- (void)updatePopover:(NSPopoverTouchBarItem*)item - (void)updatePopover:(NSPopoverTouchBarItem*)item
withSettings:(const mate::PersistentDictionary&)settings { withSettings:(const mate::PersistentDictionary&)settings {
std::string label; std::string label;
gfx::Image image;
if (settings.Get("label", &label)) { if (settings.Get("label", &label)) {
item.collapsedRepresentationLabel = base::SysUTF8ToNSString(label); item.collapsedRepresentationLabel = base::SysUTF8ToNSString(label);
} else if (settings.Get("image", &image)) { }
gfx::Image image;
if (settings.Get("icon", &image)) {
item.collapsedRepresentationImage = image.AsNSImage(); item.collapsedRepresentationImage = image.AsNSImage();
} }

1
lib/browser/api/touch-bar.js
View file

@ -174,6 +174,7 @@ TouchBar.Popover = class TouchBarPopover extends TouchBarItem {
super(config) super(config)
this.type = 'popover' this.type = 'popover'
this._addLiveProperty('label', config.label) this._addLiveProperty('label', config.label)
this._addLiveProperty('icon', config.icon)
this.showCloseButton = config.showCloseButton this.showCloseButton = config.showCloseButton
this.child = config.items this.child = config.items
if (!(this.child instanceof TouchBar)) { if (!(this.child instanceof TouchBar)) {