scratchfoundation/scratch-vm
1
0
Fork 0
mirror of https://github.com/scratchfoundation/scratch-vm.git synced 2024-12-24 06:52:40 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Add optional menuIcon for extension blocks

Browse source
This commit is contained in:
Eric Rosenbaum 2017-12-19 14:47:11 -05:00
parent 1475d95e31
commit 9613046b2f
1 changed files with 18 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
src/engine/runtime.js
View file

@ -475,7 +475,8 @@ class Runtime extends EventEmitter {
const categoryInfo = { const categoryInfo = {
id: extensionInfo.id, id: extensionInfo.id,
name: extensionInfo.name, name: extensionInfo.name,
iconURI: extensionInfo.iconURI, blockIconURI: extensionInfo.blockIconURI,
menuIconURI: extensionInfo.menuIconURI,
color1: '#FF6680', color1: '#FF6680',
color2: '#FF4D6A', color2: '#FF4D6A',
color3: '#FF3355', color3: '#FF3355',
@ -618,11 +619,11 @@ class Runtime extends EventEmitter {
blockJSON.message0 = ''; blockJSON.message0 = '';
// If an icon for the extension exists, prepend it to each block // If an icon for the extension exists, prepend it to each block
if (categoryInfo.iconURI) { if (categoryInfo.blockIconURI) {
blockJSON.message0 = '%1'; blockJSON.message0 = '%1';
const iconJSON = { const iconJSON = {
type: 'field_image', type: 'field_image',
src: categoryInfo.iconURI, src: categoryInfo.blockIconURI,
width: 40, width: 40,
height: 40 height: 40
}; };
@ -735,7 +736,20 @@ class Runtime extends EventEmitter {
for (const categoryInfo of this._blockInfo) { for (const categoryInfo of this._blockInfo) {
const {name, color1, color2} = categoryInfo; const {name, color1, color2} = categoryInfo;
const paletteBlocks = categoryInfo.blocks.filter(block => !block.info.hideFromPalette); const paletteBlocks = categoryInfo.blocks.filter(block => !block.info.hideFromPalette);
xmlParts.push(`<category name="${name}" colour="${color1}" secondaryColour="${color2}">`); const colorXML = `colour="${color1}" secondaryColour="${color2}"`;
// Use a menu icon if there is one. Otherwise, use the block icon. If there's no icon,
// the category menu will show its default colored circle.
let menuIconURI = '';
if (categoryInfo.menuIconURI) {
menuIconURI = categoryInfo.menuIconURI;
} else if (categoryInfo.blockIconURI) {
menuIconURI = categoryInfo.blockIconURI;
}
const menuIconXML = menuIconURI ?
`iconURI="${menuIconURI}"` : '';
xmlParts.push(`<category name="${name}" ${colorXML} ${menuIconXML}>`);
xmlParts.push.apply(xmlParts, paletteBlocks.map(block => block.xml)); xmlParts.push.apply(xmlParts, paletteBlocks.map(block => block.xml));
xmlParts.push('</category>'); xmlParts.push('</category>');
} }