From 899162c4201493cf7d536005e47c91947ad76ed6 Mon Sep 17 00:00:00 2001 From: Sam El-Husseini Date: Mon, 13 Jan 2020 18:39:24 -0800 Subject: [PATCH] Fix zelos top row spacer height when it precedes a statement input. (#3587) --- core/renderers/zelos/info.js | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/core/renderers/zelos/info.js b/core/renderers/zelos/info.js index 00e9c1985..c80c6b5f3 100644 --- a/core/renderers/zelos/info.js +++ b/core/renderers/zelos/info.js @@ -199,16 +199,9 @@ Blockly.zelos.RenderInfo.prototype.getSpacerRowHeight_ = function( Blockly.blockRendering.Types.isBottomRow(next)) { return this.constants_.EMPTY_BLOCK_SPACER_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) { - return this.constants_.SMALL_PADDING; - } - return this.constants_.NO_PADDING; - } - var precedesStatement = - Blockly.blockRendering.Types.isInputRow(prev) && prev.hasStatement; 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; @@ -217,6 +210,13 @@ Blockly.zelos.RenderInfo.prototype.getSpacerRowHeight_ = function( 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) { + return this.constants_.SMALL_PADDING; + } + return this.constants_.NO_PADDING; + } if ((Blockly.blockRendering.Types.isBottomRow(next))) { if (!this.outputConnection) { return this.constants_.SMALL_PADDING;