CodingPirates/blockly
1
0
Fork 0
mirror of https://github.com/google/blockly.git synced 2026-01-15 21:07:14 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3006 from moniika/moniika-dummy-input

Browse Source 
Fix logic in shouldStartNewRow_ and between row padding in geras.
This commit is contained in:
Monica Kozbial
2019-09-12 13:47:07 -07:00
committed by GitHub
parent 82e9344b8e 8a00ed9eb2
commit 7f2a1aef4d
3 changed files with 13 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -262,8 +262,9 @@ Blockly.blockRendering.RenderInfo.prototype.shouldStartNewRow_ = function(input,
if (!lastInput) {
return false;
}
// A statement input always gets a new row.
if (input.type == Blockly.NEXT_STATEMENT) {
// A statement input or an input following one always gets a new row.
if (input.type == Blockly.NEXT_STATEMENT ||
lastInput.type == Blockly.NEXT_STATEMENT) {
return true;
}
// Value and dummy inputs get new row if inputs are not inlined.
@@ -371,18 +372,15 @@ Blockly.blockRendering.RenderInfo.prototype.computeBounds_ = function() {
*/
Blockly.blockRendering.RenderInfo.prototype.alignRowElements_ = function() {
for (var i = 0, row; (row = this.rows[i]); i++) {
// TODO (#2921): this still doesn't handle the row having an inline input.
if (!row.hasInlineInput) {
if (row.hasStatement) {
this.alignStatementRow_(
/** @type {Blockly.RenderedConnection} */ (row));
} else {
var currentWidth = row.width;
var desiredWidth = this.width - this.startX;
var missingSpace = desiredWidth - currentWidth;
if (missingSpace) {
this.addAlignmentPadding_(row, missingSpace);
}
if (row.hasStatement) {
this.alignStatementRow_(
/** @type {Blockly.RenderedConnection} */ (row));
} else {
var currentWidth = row.width;
var desiredWidth = this.width - this.startX;
var missingSpace = desiredWidth - currentWidth;
if (missingSpace) {
this.addAlignmentPadding_(row, missingSpace);
}
}
}

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

@@ -64,26 +64,6 @@ Blockly.geras.RenderInfo = function(block) {
Blockly.utils.object.inherits(Blockly.geras.RenderInfo,
Blockly.blockRendering.RenderInfo);
/**
* @override
*/
Blockly.geras.RenderInfo.prototype.shouldStartNewRow_ = function(input, lastInput) {
// If this is the first input, just add to the existing row.
// That row is either empty or has some icons in it.
if (!lastInput) {
return false;
}
// A statement input always gets a new row.
if (input.type == Blockly.NEXT_STATEMENT) {
return true;
}
// Value and dummy inputs get new row if inputs are not inlined.
if (input.type == Blockly.INPUT_VALUE || input.type == Blockly.DUMMY_INPUT) {
return !this.isInline;
}
return false;
};
/**
* @override
*/
@@ -286,7 +266,7 @@ Blockly.geras.RenderInfo.prototype.getSpacerRowHeight_ = function(prev, next) {
if (prev.hasStatement && next.hasStatement) {
return this.constants_.LARGE_PADDING;
}
if (next.hasDummyInput) {
if (!prev.hasStatement && next.hasDummyInput) {
return this.constants_.LARGE_PADDING;
}
return this.constants_.MEDIUM_PADDING;

20
core/renderers/thrasos/info.js
View File

@@ -64,26 +64,6 @@ Blockly.thrasos.RenderInfo = function(block) {
Blockly.utils.object.inherits(Blockly.thrasos.RenderInfo,
Blockly.blockRendering.RenderInfo);
/**
* @override
*/
Blockly.thrasos.RenderInfo.prototype.shouldStartNewRow_ = function(input, lastInput) {
// If this is the first input, just add to the existing row.
// That row is either empty or has some icons in it.
if (!lastInput) {
return false;
}
// A statement input always gets a new row.
if (input.type == Blockly.NEXT_STATEMENT) {
return true;
}
// Value and dummy inputs get new row if inputs are not inlined.
if (input.type == Blockly.INPUT_VALUE || input.type == Blockly.DUMMY_INPUT) {
return !this.isInline;
}
return false;
};
/**
* @override
*/