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

Add Slider item type and add options to the button type

Browse source
This commit is contained in:
Samuel Attard 2016-11-28 21:43:39 +11:00 • committed by Kevin Sawicki
parent 18c7c3ece8
commit c92c4138a8
5 changed files with 191 additions and 53 deletions
Download patch file Download diff file Expand all files Collapse all files

2
lib/browser/api/browser-window.js
View file

@ -134,7 +134,7 @@ BrowserWindow.prototype._init = function () {
// Proxy TouchBar events
this.on('-touch-bar-interaction', (event, item_type, id, ...args) => {
TouchBar._event(id, ...args)
TouchBar._event(item_type, id, ...args)
})
}

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

@ -23,8 +23,11 @@ class TouchBar {
let item_id_incrementor = 1
const item_event_handlers = {}
TouchBar._event = (eventArgs) => {
const args = eventArgs.slice(1)
TouchBar._event = (itemType, eventArgs) => {
let args = eventArgs.slice(1)
if (itemType === 'slider') {
args = args.map(val => parseInt(val, 10))
}
const id_parts = eventArgs[0].split('.')
const item_id = id_parts[id_parts.length - 1]
if (item_event_handlers[item_id]) item_event_handlers[item_id](...args)
@ -79,11 +82,17 @@ TouchBar.Label = class TouchBarLabel extends TouchBarItem {
}
}
TouchBar.List = class TouchBarList extends TouchBarItem {}
TouchBar.List = class TouchBarList extends TouchBarItem {
constructor (config) {
super(config)
this.config.type = 'list'
}
}
TouchBar.Slider = class TouchBarSlider extends TouchBarItem {
constructor (config) {
super(config)
this.config.type = 'slider';
const change = this.config.change
if (typeof change === 'function') {
item_event_handlers[this.id] = change