github/electron
1
1
Fork 0
mirror of https://github.com/electron/electron.git synced 2026-04-10 03:01:51 -04:00
Code Issues Packages Projects Releases Wiki Activity

Support icon property to match MenuItem

Browse Source
This commit is contained in:
Kevin Sawicki
2017-03-02 12:56:23 -08:00
parent 506b42b563
commit a34f9d3583
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
atom/browser/ui/cocoa/atom_touch_bar.mm
View File

@@ -227,7 +227,7 @@ static NSTouchBarItemIdentifier SliderIdentifier = @"com.electron.touchbar.slide
}
gfx::Image image;
if (settings.Get("image", &image)) {
if (settings.Get("icon", &image)) {
button.image = image.AsNSImage();
}
}

3
lib/browser/api/touch-bar.js
View File

@@ -115,9 +115,10 @@ TouchBar.Button = class TouchBarButton extends TouchBarItem {
constructor (config) {
super(config)
this.type = 'button'
const {click, label, backgroundColor} = config
const {click, icon, label, backgroundColor} = config
this._addLiveProperty('label', label)
this._addLiveProperty('backgroundColor', backgroundColor)
this._addLiveProperty('icon', icon)
if (typeof click === 'function') {
this.onInteraction = config.click
}