CodingPirates/blockly
1
0
Fork 0
mirror of https://github.com/google/blockly.git synced 2026-01-10 02:17:09 +01:00
Code Issues Packages Projects Releases Wiki Activity

Revert "Wrap dummy inputs in a measurable so that it can be aligned appropriately. (#3337)"

Browse Source 
This reverts commit 7fc733b81f.
This commit is contained in:
Sam El-Husseini
2019-10-24 21:53:30 -07:00
parent a79ea1652a
commit 100da4a66c
3 changed files with 4 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/renderers/common/info.js
View File

@@ -374,8 +374,8 @@ Blockly.blockRendering.RenderInfo.prototype.addInput_ = function(input, activeRo
new Blockly.blockRendering.ExternalValueInput(this.constants_, input));
activeRow.hasExternalInput = true;
} else if (input.type == Blockly.DUMMY_INPUT) {
activeRow.elements.push(
new Blockly.blockRendering.DummyInput(this.constants_, input));
// Dummy inputs have no visual representation, but the information is still
// important.
activeRow.hasDummyInput = true;
}
};

4
core/renderers/geras/info.js
View File

@@ -113,8 +113,8 @@ Blockly.geras.RenderInfo.prototype.addInput_ = function(input, activeRow) {
new Blockly.blockRendering.ExternalValueInput(this.constants_, input));
activeRow.hasExternalInput = true;
} else if (input.type == Blockly.DUMMY_INPUT) {
activeRow.elements.push(
new Blockly.blockRendering.DummyInput(this.constants_, input));
// Dummy inputs have no visual representation, but the information is still
// important.
activeRow.hasDummyInput = true;
}
};

21
core/renderers/measurables/inputs.js
View File

@@ -70,27 +70,6 @@ Blockly.blockRendering.InputConnection = function(constants, input) {
Blockly.utils.object.inherits(Blockly.blockRendering.InputConnection,
Blockly.blockRendering.Connection);
/**
* An object containing information about the space a dummy input takes up
* during rendering
* @param {!Blockly.blockRendering.ConstantProvider} constants The rendering
* constants provider.
* @param {!Blockly.Input} input The inline input to measure and store
* information for.
* @package
* @constructor
* @extends {Blockly.blockRendering.Measurable}
*/
Blockly.blockRendering.DummyInput = function(constants, input) {
Blockly.blockRendering.DummyInput.superClass_.constructor.call(this,
constants);
this.type |= Blockly.blockRendering.Types.INPUT;
this.input = input;
this.align = input.align;
};
Blockly.utils.object.inherits(Blockly.blockRendering.DummyInput,
Blockly.blockRendering.Measurable);
/**
* An object containing information about the space an inline input takes up
* during rendering