scratchfoundation/scratch-blocks
1
0
Fork 0
mirror of https://github.com/scratchfoundation/scratch-blocks.git synced 2025-08-01 16:51:10 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Allow custom gaps to be specified between toolbox blocks.

Browse source
This commit is contained in:
Neil Fraser 2015-10-25 22:20:08 -04:00
parent d07d103f1d
commit b10ef6da48
4 changed files with 98 additions and 79 deletions

63
core/variables.js
View file

@ -93,43 +93,50 @@ Blockly.Variables.renameVariable = function(oldName, newName, workspace) {
/**
* Construct the blocks required by the flyout for the variable category.
* @param {!Array.<!Blockly.Block>} blocks List of blocks to show.
* @param {!Array.<number>} gaps List of widths between blocks.
* @param {number} margin Standard margin width for calculating gaps.
* @param {!Blockly.Workspace} workspace The flyout's workspace.
* @param {!Blockly.Workspace} workspace The workspace contianing variables.
* @return {!Array.<!Element>} Array of XML block elements.
*/
Blockly.Variables.flyoutCategory = function(blocks, gaps, margin, workspace) {
var variableList = Blockly.Variables.allVariables(workspace.targetWorkspace);
Blockly.Variables.flyoutCategory = function(workspace) {
var variableList = Blockly.Variables.allVariables(workspace);
variableList.sort(goog.string.caseInsensitiveCompare);
// In addition to the user's variables, we also want to display the default
// variable name at the top. We also don't want this duplicated if the
// user has created a variable of the same name.
variableList.unshift(null);
var defaultVariable = undefined;
goog.array.remove(variableList, Blockly.Msg.VARIABLES_DEFAULT_NAME);
variableList.unshift(Blockly.Msg.VARIABLES_DEFAULT_NAME);
var xmlList = [];
for (var i = 0; i < variableList.length; i++) {
if (variableList[i] === defaultVariable) {
continue;
if (Blockly.Blocks['variables_set']) {
// <block type="variables_set" gap="8">
// <field name="VAR">item</field>
// </block>
var block = goog.dom.createDom('block');
block.setAttribute('type', 'variables_set');
if (Blockly.Blocks['variables_get']) {
block.setAttribute('gap', 8);
}
var field = goog.dom.createDom('field', null, variableList[i]);
field.setAttribute('name', 'VAR');
block.appendChild(field);
xmlList.push(block);
}
var getBlock = Blockly.Blocks['variables_get'] ?
Blockly.Block.obtain(workspace, 'variables_get') : null;
getBlock && getBlock.initSvg();
var setBlock = Blockly.Blocks['variables_set'] ?
Blockly.Block.obtain(workspace, 'variables_set') : null;
setBlock && setBlock.initSvg();
if (variableList[i] === null) {
defaultVariable = (getBlock || setBlock).getVars()[0];
} else {
getBlock && getBlock.setFieldValue(variableList[i], 'VAR');
setBlock && setBlock.setFieldValue(variableList[i], 'VAR');
}
setBlock && blocks.push(setBlock);
getBlock && blocks.push(getBlock);
if (getBlock && setBlock) {
gaps.push(margin, margin * 3);
} else {
gaps.push(margin * 2);
if (Blockly.Blocks['variables_get']) {
// <block type="variables_get" gap="24">
// <field name="VAR">item</field>
// </block>
var block = goog.dom.createDom('block');
block.setAttribute('type', 'variables_get');
if (Blockly.Blocks['variables_set']) {
block.setAttribute('gap', 24);
}
var field = goog.dom.createDom('field', null, variableList[i]);
field.setAttribute('name', 'VAR');
block.appendChild(field);
xmlList.push(block);
}
}
return xmlList;
};
/**