mirror of
https://github.com/google/blockly.git
synced 2026-01-08 01:20:12 +01:00
599 lines
22 KiB
JavaScript
599 lines
22 KiB
JavaScript
/**
|
|
* @license
|
|
* Copyright 2019 Google LLC
|
|
* SPDX-License-Identifier: Apache-2.0
|
|
*/
|
|
|
|
/**
|
|
* @fileoverview Makecode/scratch-style renderer.
|
|
* Zelos: spirit of eager rivalry, emulation, envy, jealousy, and zeal.
|
|
* @author fenichel@google.com (Rachel Fenichel)
|
|
*/
|
|
'use strict';
|
|
|
|
goog.provide('Blockly.zelos');
|
|
goog.provide('Blockly.zelos.RenderInfo');
|
|
|
|
goog.require('Blockly.blockRendering.BottomRow');
|
|
goog.require('Blockly.blockRendering.ExternalValueInput');
|
|
goog.require('Blockly.blockRendering.InlineInput');
|
|
goog.require('Blockly.blockRendering.InputRow');
|
|
goog.require('Blockly.blockRendering.InRowSpacer');
|
|
goog.require('Blockly.blockRendering.Measurable');
|
|
goog.require('Blockly.blockRendering.NextConnection');
|
|
goog.require('Blockly.blockRendering.OutputConnection');
|
|
goog.require('Blockly.blockRendering.PreviousConnection');
|
|
goog.require('Blockly.blockRendering.RenderInfo');
|
|
goog.require('Blockly.blockRendering.RoundCorner');
|
|
goog.require('Blockly.blockRendering.Row');
|
|
goog.require('Blockly.blockRendering.SpacerRow');
|
|
goog.require('Blockly.blockRendering.SquareCorner');
|
|
goog.require('Blockly.blockRendering.TopRow');
|
|
goog.require('Blockly.blockRendering.Types');
|
|
goog.require('Blockly.constants');
|
|
goog.require('Blockly.FieldImage');
|
|
goog.require('Blockly.FieldLabel');
|
|
goog.require('Blockly.FieldTextInput');
|
|
goog.require('Blockly.inputTypes');
|
|
goog.require('Blockly.utils.object');
|
|
goog.require('Blockly.zelos.BottomRow');
|
|
goog.require('Blockly.zelos.RightConnectionShape');
|
|
goog.require('Blockly.zelos.StatementInput');
|
|
goog.require('Blockly.zelos.TopRow');
|
|
|
|
goog.requireType('Blockly.BlockSvg');
|
|
goog.requireType('Blockly.zelos.ConstantProvider');
|
|
goog.requireType('Blockly.zelos.Renderer');
|
|
|
|
|
|
/**
|
|
* An object containing all sizing information needed to draw this block.
|
|
*
|
|
* This measure pass does not propagate changes to the block (although fields
|
|
* may choose to rerender when getSize() is called). However, calling it
|
|
* repeatedly may be expensive.
|
|
*
|
|
* @param {!Blockly.zelos.Renderer} renderer The renderer in use.
|
|
* @param {!Blockly.BlockSvg} block The block to measure.
|
|
* @constructor
|
|
* @package
|
|
* @extends {Blockly.blockRendering.RenderInfo}
|
|
*/
|
|
Blockly.zelos.RenderInfo = function(renderer, block) {
|
|
Blockly.zelos.RenderInfo.superClass_.constructor.call(this, renderer, block);
|
|
|
|
/**
|
|
* An object with rendering information about the top row of the block.
|
|
* @type {!Blockly.zelos.TopRow}
|
|
* @override
|
|
*/
|
|
this.topRow = new Blockly.zelos.TopRow(this.constants_);
|
|
|
|
/**
|
|
* An object with rendering information about the bottom row of the block.
|
|
* @type {!Blockly.zelos.BottomRow}
|
|
* @override
|
|
*/
|
|
this.bottomRow = new Blockly.zelos.BottomRow(this.constants_);
|
|
|
|
/**
|
|
* @override
|
|
*/
|
|
this.isInline = true;
|
|
|
|
/**
|
|
* Whether the block should be rendered as a multi-line block, either because
|
|
* it's not inline or because it has been collapsed.
|
|
* @type {boolean}
|
|
*/
|
|
this.isMultiRow = !block.getInputsInline() || block.isCollapsed();
|
|
|
|
/**
|
|
* Whether or not the block has a statement input in one of its rows.
|
|
* @type {boolean}
|
|
*/
|
|
this.hasStatementInput = block.statementInputCount > 0;
|
|
|
|
/**
|
|
* An object with rendering information about the right connection shape.
|
|
* @type {Blockly.zelos.RightConnectionShape}
|
|
*/
|
|
this.rightSide = this.outputConnection ?
|
|
new Blockly.zelos.RightConnectionShape(this.constants_) : null;
|
|
};
|
|
Blockly.utils.object.inherits(Blockly.zelos.RenderInfo,
|
|
Blockly.blockRendering.RenderInfo);
|
|
|
|
/**
|
|
* Get the block renderer in use.
|
|
* @return {!Blockly.zelos.Renderer} The block renderer in use.
|
|
* @package
|
|
*/
|
|
Blockly.zelos.RenderInfo.prototype.getRenderer = function() {
|
|
return /** @type {!Blockly.zelos.Renderer} */ (this.renderer_);
|
|
};
|
|
|
|
/**
|
|
* @override
|
|
*/
|
|
Blockly.zelos.RenderInfo.prototype.measure = function() {
|
|
// Modifying parent measure method to add `adjustXPosition_`.
|
|
this.createRows_();
|
|
this.addElemSpacing_();
|
|
this.addRowSpacing_();
|
|
this.adjustXPosition_();
|
|
this.computeBounds_();
|
|
this.alignRowElements_();
|
|
this.finalize_();
|
|
};
|
|
|
|
/**
|
|
* @override
|
|
*/
|
|
Blockly.zelos.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 or an input following one always gets a new row.
|
|
if (input.type == Blockly.inputTypes.STATEMENT ||
|
|
lastInput.type == Blockly.inputTypes.STATEMENT) {
|
|
return true;
|
|
}
|
|
// Value and dummy inputs get new row if inputs are not inlined.
|
|
if (input.type == Blockly.inputTypes.VALUE ||
|
|
input.type == Blockly.inputTypes.DUMMY) {
|
|
return !this.isInline || this.isMultiRow;
|
|
}
|
|
return false;
|
|
};
|
|
|
|
|
|
/**
|
|
* @override
|
|
*/
|
|
Blockly.zelos.RenderInfo.prototype.getDesiredRowWidth_ = function(row) {
|
|
if (row.hasStatement) {
|
|
var rightCornerWidth = this.constants_.INSIDE_CORNERS.rightWidth || 0;
|
|
return this.width - this.startX - rightCornerWidth;
|
|
}
|
|
return Blockly.zelos.RenderInfo.superClass_.getDesiredRowWidth_.call(this,
|
|
row);
|
|
};
|
|
|
|
/**
|
|
* @override
|
|
*/
|
|
Blockly.zelos.RenderInfo.prototype.getInRowSpacing_ = function(prev, next) {
|
|
if (!prev || !next) {
|
|
// No need for padding at the beginning or end of the row if the
|
|
// output shape is dynamic.
|
|
if (this.outputConnection && this.outputConnection.isDynamicShape &&
|
|
!this.hasStatementInput && !this.bottomRow.hasNextConnection) {
|
|
return this.constants_.NO_PADDING;
|
|
}
|
|
}
|
|
if (!prev) {
|
|
// Statement input padding.
|
|
if (next && Blockly.blockRendering.Types.isStatementInput(next)) {
|
|
return this.constants_.STATEMENT_INPUT_PADDING_LEFT;
|
|
}
|
|
}
|
|
// Spacing between a rounded corner and a previous or next connection.
|
|
if (prev && Blockly.blockRendering.Types.isLeftRoundedCorner(prev) && next) {
|
|
if (Blockly.blockRendering.Types.isPreviousConnection(next) ||
|
|
Blockly.blockRendering.Types.isNextConnection(next)) {
|
|
return next.notchOffset - this.constants_.CORNER_RADIUS;
|
|
}
|
|
}
|
|
// Spacing between a square corner and a hat.
|
|
if (prev && Blockly.blockRendering.Types.isLeftSquareCorner(prev) && next &&
|
|
Blockly.blockRendering.Types.isHat(next)) {
|
|
return this.constants_.NO_PADDING;
|
|
}
|
|
return this.constants_.MEDIUM_PADDING;
|
|
};
|
|
|
|
/**
|
|
* @override
|
|
*/
|
|
Blockly.zelos.RenderInfo.prototype.getSpacerRowHeight_ = function(
|
|
prev, next) {
|
|
// If we have an empty block add a spacer to increase the height.
|
|
if (Blockly.blockRendering.Types.isTopRow(prev) &&
|
|
Blockly.blockRendering.Types.isBottomRow(next)) {
|
|
return this.constants_.EMPTY_BLOCK_SPACER_HEIGHT;
|
|
}
|
|
var followsStatement =
|
|
Blockly.blockRendering.Types.isInputRow(prev) && prev.hasStatement;
|
|
var precedesStatement =
|
|
Blockly.blockRendering.Types.isInputRow(next) && next.hasStatement;
|
|
if (precedesStatement || followsStatement) {
|
|
var cornerHeight = this.constants_.INSIDE_CORNERS.rightHeight || 0;
|
|
var height = Math.max(this.constants_.NOTCH_HEIGHT, cornerHeight);
|
|
return precedesStatement && followsStatement ?
|
|
Math.max(height, this.constants_.DUMMY_INPUT_MIN_HEIGHT) : height;
|
|
}
|
|
// Top and bottom rows act as a spacer so we don't need any extra padding.
|
|
if ((Blockly.blockRendering.Types.isTopRow(prev))) {
|
|
if (!prev.hasPreviousConnection &&
|
|
(!this.outputConnection || this.hasStatementInput)) {
|
|
return Math.abs(this.constants_.NOTCH_HEIGHT -
|
|
this.constants_.CORNER_RADIUS);
|
|
}
|
|
return this.constants_.NO_PADDING;
|
|
}
|
|
if ((Blockly.blockRendering.Types.isBottomRow(next))) {
|
|
if (!this.outputConnection) {
|
|
var topHeight = Math.max(this.topRow.minHeight,
|
|
Math.max(this.constants_.NOTCH_HEIGHT,
|
|
this.constants_.CORNER_RADIUS)) - this.constants_.CORNER_RADIUS;
|
|
return topHeight;
|
|
} else if (!next.hasNextConnection && this.hasStatementInput) {
|
|
return Math.abs(this.constants_.NOTCH_HEIGHT -
|
|
this.constants_.CORNER_RADIUS);
|
|
}
|
|
return this.constants_.NO_PADDING;
|
|
}
|
|
return this.constants_.MEDIUM_PADDING;
|
|
};
|
|
|
|
/**
|
|
* @override
|
|
*/
|
|
Blockly.zelos.RenderInfo.prototype.getSpacerRowWidth_ = function(prev, next) {
|
|
var width = this.width - this.startX;
|
|
if ((Blockly.blockRendering.Types.isInputRow(prev) && prev.hasStatement) ||
|
|
(Blockly.blockRendering.Types.isInputRow(next) && next.hasStatement)) {
|
|
return Math.max(width, this.constants_.STATEMENT_INPUT_SPACER_MIN_WIDTH);
|
|
}
|
|
return width;
|
|
};
|
|
|
|
/**
|
|
* @override
|
|
*/
|
|
Blockly.zelos.RenderInfo.prototype.getElemCenterline_ = function(row, elem) {
|
|
if (row.hasStatement && !Blockly.blockRendering.Types.isSpacer(elem) &&
|
|
!Blockly.blockRendering.Types.isStatementInput(elem)) {
|
|
return row.yPos + this.constants_.EMPTY_STATEMENT_INPUT_HEIGHT / 2;
|
|
}
|
|
if (Blockly.blockRendering.Types.isInlineInput(elem)) {
|
|
var connectedBlock = elem.connectedBlock;
|
|
if (connectedBlock && connectedBlock.outputConnection &&
|
|
connectedBlock.nextConnection) {
|
|
return row.yPos + connectedBlock.height / 2;
|
|
}
|
|
}
|
|
return Blockly.zelos.RenderInfo.superClass_.getElemCenterline_.call(this,
|
|
row, elem);
|
|
};
|
|
|
|
/**
|
|
* @override
|
|
*/
|
|
Blockly.zelos.RenderInfo.prototype.addInput_ = function(input, activeRow) {
|
|
// If we have two dummy inputs on the same row, one aligned left and the other
|
|
// right, keep track of the right aligned dummy input so we can add padding
|
|
// later.
|
|
if (input.type == Blockly.inputTypes.DUMMY && activeRow.hasDummyInput &&
|
|
activeRow.align == Blockly.constants.ALIGN.LEFT &&
|
|
input.align == Blockly.constants.ALIGN.RIGHT) {
|
|
activeRow.rightAlignedDummyInput = input;
|
|
}
|
|
Blockly.zelos.RenderInfo.superClass_.addInput_.call(this, input, activeRow);
|
|
};
|
|
|
|
/**
|
|
* @override
|
|
*/
|
|
Blockly.zelos.RenderInfo.prototype.addAlignmentPadding_ = function(row,
|
|
missingSpace) {
|
|
if (row.rightAlignedDummyInput) {
|
|
var alignmentDivider;
|
|
for (var i = 0, elem; (elem = row.elements[i]); i++) {
|
|
if (Blockly.blockRendering.Types.isSpacer(elem)) {
|
|
alignmentDivider = elem;
|
|
}
|
|
if (Blockly.blockRendering.Types.isField(elem) &&
|
|
elem.parentInput == row.rightAlignedDummyInput) {
|
|
break;
|
|
}
|
|
}
|
|
if (alignmentDivider) {
|
|
alignmentDivider.width += missingSpace;
|
|
row.width += missingSpace;
|
|
return;
|
|
}
|
|
}
|
|
Blockly.zelos.RenderInfo.superClass_.addAlignmentPadding_.call(this, row,
|
|
missingSpace);
|
|
};
|
|
|
|
/**
|
|
* Adjust the x position of fields to bump all non-label fields in the first row
|
|
* past the notch position. This must be called before ``computeBounds`` is
|
|
* called.
|
|
* @protected
|
|
*/
|
|
Blockly.zelos.RenderInfo.prototype.adjustXPosition_ = function() {
|
|
var notchTotalWidth = this.constants_.NOTCH_OFFSET_LEFT +
|
|
this.constants_.NOTCH_WIDTH;
|
|
var minXPos = notchTotalWidth;
|
|
// Run through every input row on the block and only apply bump logic to the
|
|
// first input row (if the block has prev connection) and every input row that
|
|
// has a prev and next notch.
|
|
for (var i = 2; i < this.rows.length - 1; i += 2) {
|
|
var prevSpacer = this.rows[i - 1];
|
|
var row = this.rows[i];
|
|
var nextSpacer = this.rows[i + 1];
|
|
|
|
var hasPrevNotch = i == 2 ?
|
|
!!this.topRow.hasPreviousConnection : !!prevSpacer.followsStatement;
|
|
var hasNextNotch = i + 2 >= this.rows.length - 1 ?
|
|
!!this.bottomRow.hasNextConnection : !!nextSpacer.precedesStatement;
|
|
|
|
if (Blockly.blockRendering.Types.isInputRow(row) && row.hasStatement) {
|
|
row.measure();
|
|
minXPos = row.width - row.getLastInput().width + notchTotalWidth;
|
|
} else if (hasPrevNotch && (i == 2 || hasNextNotch) &&
|
|
Blockly.blockRendering.Types.isInputRow(row) && !row.hasStatement) {
|
|
var xCursor = row.xPos;
|
|
var prevInRowSpacer = null;
|
|
for (var j = 0, elem; (elem = row.elements[j]); j++) {
|
|
if (Blockly.blockRendering.Types.isSpacer(elem)) {
|
|
prevInRowSpacer = elem;
|
|
}
|
|
if (prevInRowSpacer && (Blockly.blockRendering.Types.isField(elem) ||
|
|
Blockly.blockRendering.Types.isInput(elem))) {
|
|
if (xCursor < minXPos &&
|
|
!(Blockly.blockRendering.Types.isField(elem) &&
|
|
(elem.field instanceof Blockly.FieldLabel ||
|
|
elem.field instanceof Blockly.FieldImage))) {
|
|
var difference = minXPos - xCursor;
|
|
prevInRowSpacer.width += difference;
|
|
}
|
|
}
|
|
xCursor += elem.width;
|
|
}
|
|
}
|
|
}
|
|
};
|
|
|
|
/**
|
|
* Finalize the output connection info. In particular, set the height of the
|
|
* output connection to match that of the block. For the right side, add a
|
|
* right connection shape element and have it match the dimensions of the
|
|
* output connection.
|
|
* @protected
|
|
*/
|
|
Blockly.zelos.RenderInfo.prototype.finalizeOutputConnection_ = function() {
|
|
// Dynamic output connections depend on the height of the block.
|
|
if (!this.outputConnection || !this.outputConnection.isDynamicShape) {
|
|
return;
|
|
}
|
|
var yCursor = 0;
|
|
// Determine the block height.
|
|
for (var i = 0, row; (row = this.rows[i]); i++) {
|
|
row.yPos = yCursor;
|
|
yCursor += row.height;
|
|
}
|
|
this.height = yCursor;
|
|
|
|
// Adjust the height of the output connection.
|
|
var blockHeight = this.bottomRow.hasNextConnection ?
|
|
this.height - this.bottomRow.descenderHeight : this.height;
|
|
var connectionHeight = this.outputConnection.shape.height(blockHeight);
|
|
var connectionWidth = this.outputConnection.shape.width(blockHeight);
|
|
|
|
this.outputConnection.height = connectionHeight;
|
|
this.outputConnection.width = connectionWidth;
|
|
this.outputConnection.startX = connectionWidth;
|
|
this.outputConnection.connectionOffsetY =
|
|
this.outputConnection.shape.connectionOffsetY(connectionHeight);
|
|
this.outputConnection.connectionOffsetX =
|
|
this.outputConnection.shape.connectionOffsetX(connectionWidth);
|
|
|
|
// Add the right connection measurable.
|
|
// Don't add it if we have a value-to-statement or a value-to-stack block.
|
|
var rightConnectionWidth = 0;
|
|
if (!this.hasStatementInput && !this.bottomRow.hasNextConnection) {
|
|
rightConnectionWidth = connectionWidth;
|
|
this.rightSide.height = connectionHeight;
|
|
this.rightSide.width = rightConnectionWidth;
|
|
this.rightSide.centerline = connectionHeight / 2;
|
|
this.rightSide.xPos = this.width + rightConnectionWidth;
|
|
}
|
|
this.startX = connectionWidth;
|
|
this.width += connectionWidth + rightConnectionWidth;
|
|
this.widthWithChildren += connectionWidth + rightConnectionWidth;
|
|
};
|
|
|
|
/**
|
|
* Finalize horizontal alignment of elements on the block. In particular,
|
|
* reduce the implicit spacing created by the left and right output connection
|
|
* shapes by adding setting negative spacing onto the leftmost and rightmost
|
|
* spacers.
|
|
* @protected
|
|
*/
|
|
Blockly.zelos.RenderInfo.prototype.finalizeHorizontalAlignment_ = function() {
|
|
if (!this.outputConnection || this.hasStatementInput ||
|
|
this.bottomRow.hasNextConnection) {
|
|
return;
|
|
}
|
|
var totalNegativeSpacing = 0;
|
|
for (var i = 0, row; (row = this.rows[i]); i++) {
|
|
if (!Blockly.blockRendering.Types.isInputRow(row)) {
|
|
continue;
|
|
}
|
|
var firstElem = row.elements[1];
|
|
var lastElem = row.elements[row.elements.length - 2];
|
|
var leftNegPadding = this.getNegativeSpacing_(firstElem);
|
|
var rightNegPadding = this.getNegativeSpacing_(lastElem);
|
|
totalNegativeSpacing = leftNegPadding + rightNegPadding;
|
|
var minBlockWidth = this.constants_.MIN_BLOCK_WIDTH +
|
|
this.outputConnection.width * 2;
|
|
if (this.width - totalNegativeSpacing < minBlockWidth) {
|
|
// Maintain a minimum block width, split negative spacing between left
|
|
// and right edge.
|
|
totalNegativeSpacing = this.width - minBlockWidth;
|
|
leftNegPadding = totalNegativeSpacing / 2;
|
|
rightNegPadding = totalNegativeSpacing / 2;
|
|
}
|
|
// Add a negative spacer on the start and end of the block.
|
|
row.elements.unshift(new Blockly.blockRendering.InRowSpacer(this.constants_,
|
|
-leftNegPadding));
|
|
row.elements.push(new Blockly.blockRendering.InRowSpacer(this.constants_,
|
|
-rightNegPadding));
|
|
}
|
|
if (totalNegativeSpacing) {
|
|
this.width -= totalNegativeSpacing;
|
|
this.widthWithChildren -= totalNegativeSpacing;
|
|
this.rightSide.xPos -= totalNegativeSpacing;
|
|
for (var i = 0, row; (row = this.rows[i]); i++) {
|
|
if (Blockly.blockRendering.Types.isTopOrBottomRow(row)) {
|
|
row.elements[1].width -= totalNegativeSpacing;
|
|
row.elements[1].widthWithConnectedBlocks -= totalNegativeSpacing;
|
|
}
|
|
row.width -= totalNegativeSpacing;
|
|
row.widthWithConnectedBlocks -= totalNegativeSpacing;
|
|
}
|
|
}
|
|
};
|
|
|
|
/**
|
|
* Calculate the spacing to reduce the left and right edges by based on the
|
|
* outer and inner connection shape.
|
|
* @param {Blockly.blockRendering.Measurable} elem The first or last element on
|
|
* a block.
|
|
* @return {number} The amount of spacing to reduce the first or last spacer.
|
|
* @protected
|
|
*/
|
|
Blockly.zelos.RenderInfo.prototype.getNegativeSpacing_ = function(elem) {
|
|
if (!elem) {
|
|
return 0;
|
|
}
|
|
var connectionWidth = this.outputConnection.width;
|
|
var outerShape = this.outputConnection.shape.type;
|
|
var constants =
|
|
/** @type {!Blockly.zelos.ConstantProvider} */ (this.constants_);
|
|
if (this.isMultiRow && this.inputRows.length > 1) {
|
|
switch (outerShape) {
|
|
case constants.SHAPES.ROUND:
|
|
// Special case for multi-row round reporter blocks.
|
|
var maxWidth = this.constants_.MAX_DYNAMIC_CONNECTION_SHAPE_WIDTH;
|
|
var width = this.height / 2 > maxWidth ? maxWidth : this.height / 2;
|
|
var topPadding = this.constants_.SMALL_PADDING;
|
|
var roundPadding = width *
|
|
(1 - Math.sin(Math.acos((width - topPadding) / width)));
|
|
return connectionWidth - roundPadding;
|
|
default:
|
|
return 0;
|
|
}
|
|
}
|
|
if (Blockly.blockRendering.Types.isInlineInput(elem)) {
|
|
var connectedBlock = elem.connectedBlock;
|
|
var innerShape = connectedBlock ?
|
|
connectedBlock.pathObject.outputShapeType :
|
|
elem.shape.type;
|
|
// Special case for value to stack / value to statement blocks.
|
|
if (connectedBlock && connectedBlock.outputConnection &&
|
|
(connectedBlock.statementInputCount || connectedBlock.nextConnection)) {
|
|
return 0;
|
|
}
|
|
// Special case for hexagonal output.
|
|
if (outerShape == constants.SHAPES.HEXAGONAL &&
|
|
outerShape != innerShape) {
|
|
return 0;
|
|
}
|
|
return connectionWidth -
|
|
this.constants_.SHAPE_IN_SHAPE_PADDING[outerShape][innerShape];
|
|
} else if (Blockly.blockRendering.Types.isField(elem)) {
|
|
// Special case for text inputs.
|
|
if (outerShape == constants.SHAPES.ROUND &&
|
|
elem.field instanceof Blockly.FieldTextInput) {
|
|
return connectionWidth - (2.75 * constants.GRID_UNIT);
|
|
}
|
|
return connectionWidth -
|
|
this.constants_.SHAPE_IN_SHAPE_PADDING[outerShape][0];
|
|
} else if (Blockly.blockRendering.Types.isIcon(elem)) {
|
|
return this.constants_.SMALL_PADDING;
|
|
}
|
|
return 0;
|
|
};
|
|
|
|
/**
|
|
* Finalize vertical alignment of rows on a block. In particular, reduce the
|
|
* implicit spacing when a non-shadow block is connected to any of an input
|
|
* row's inline inputs.
|
|
* @protected
|
|
*/
|
|
Blockly.zelos.RenderInfo.prototype.finalizeVerticalAlignment_ = function() {
|
|
if (this.outputConnection) {
|
|
return;
|
|
}
|
|
// Run through every input row on the block and only apply tight nesting logic
|
|
// to input rows that have a prev and next notch.
|
|
for (var i = 2; i < this.rows.length - 1; i += 2) {
|
|
var prevSpacer = this.rows[i - 1];
|
|
var row = this.rows[i];
|
|
var nextSpacer = this.rows[i + 1];
|
|
|
|
var firstRow = i == 2;
|
|
var hasPrevNotch = firstRow ?
|
|
!!this.topRow.hasPreviousConnection : !!prevSpacer.followsStatement;
|
|
var hasNextNotch = i + 2 >= this.rows.length - 1 ?
|
|
!!this.bottomRow.hasNextConnection : !!nextSpacer.precedesStatement;
|
|
|
|
if (hasPrevNotch) {
|
|
var hasSingleTextOrImageField = row.elements.length == 3 &&
|
|
(row.elements[1].field instanceof Blockly.FieldLabel ||
|
|
row.elements[1].field instanceof Blockly.FieldImage);
|
|
if (!firstRow && hasSingleTextOrImageField) {
|
|
// Remove some padding if we have a single image or text field.
|
|
prevSpacer.height -= this.constants_.SMALL_PADDING;
|
|
nextSpacer.height -= this.constants_.SMALL_PADDING;
|
|
row.height -= this.constants_.MEDIUM_PADDING;
|
|
} else if (!firstRow && !hasNextNotch) {
|
|
// Add a small padding so the notch doesn't clash with inputs/fields.
|
|
prevSpacer.height += this.constants_.SMALL_PADDING;
|
|
} else if (hasNextNotch) {
|
|
// Determine if the input row has non-shadow connected blocks.
|
|
var hasNonShadowConnectedBlocks = false;
|
|
var MIN_VERTICAL_TIGHTNESTING_HEIGHT = 40;
|
|
for (var j = 0, elem; (elem = row.elements[j]); j++) {
|
|
if (Blockly.blockRendering.Types.isInlineInput(elem) &&
|
|
elem.connectedBlock && !elem.connectedBlock.isShadow() &&
|
|
elem.connectedBlock.getHeightWidth().height >=
|
|
MIN_VERTICAL_TIGHTNESTING_HEIGHT) {
|
|
hasNonShadowConnectedBlocks = true;
|
|
break;
|
|
}
|
|
}
|
|
// Apply tight-nesting if we have both a prev and next notch and the
|
|
// block has non-shadow connected blocks.
|
|
if (hasNonShadowConnectedBlocks) {
|
|
prevSpacer.height -= this.constants_.SMALL_PADDING;
|
|
nextSpacer.height -= this.constants_.SMALL_PADDING;
|
|
}
|
|
}
|
|
}
|
|
}
|
|
};
|
|
|
|
/**
|
|
* @override
|
|
*/
|
|
Blockly.zelos.RenderInfo.prototype.finalize_ = function() {
|
|
this.finalizeOutputConnection_();
|
|
this.finalizeHorizontalAlignment_();
|
|
this.finalizeVerticalAlignment_();
|
|
Blockly.zelos.RenderInfo.superClass_.finalize_.call(this);
|
|
|
|
if (this.rightSide) {
|
|
this.widthWithChildren += this.rightSide.width;
|
|
}
|
|
};
|