From 38fe5189bbac6f106afa986455fbafc54eaf79be Mon Sep 17 00:00:00 2001 From: Sam El-Husseini Date: Tue, 10 Dec 2019 16:51:36 -0800 Subject: [PATCH] [zelos] Limit vertical tightnesting (#3504) * Limit vertical tight nesting to blocks with a certain height * Use const. --- core/renderers/zelos/info.js | 5 ++++- core/renderers/zelos/path_object.js | 6 ++++++ 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/core/renderers/zelos/info.js b/core/renderers/zelos/info.js index 56a549235..22e46dfe5 100644 --- a/core/renderers/zelos/info.js +++ b/core/renderers/zelos/info.js @@ -398,9 +398,12 @@ Blockly.zelos.RenderInfo.prototype.finalizeVerticalAlignment_ = function() { if (Blockly.blockRendering.Types.isInputRow(row)) { // 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 && !elem.connectedBlock.isShadow() && + elem.connectedBlock.getHeightWidth().height >= + MIN_VERTICAL_TIGHTNESTING_HEIGHT) { hasNonShadowConnectedBlocks = true; break; } diff --git a/core/renderers/zelos/path_object.js b/core/renderers/zelos/path_object.js index 56e7932d6..70ced53b9 100644 --- a/core/renderers/zelos/path_object.js +++ b/core/renderers/zelos/path_object.js @@ -104,6 +104,12 @@ Blockly.zelos.PathObject.prototype.applyColour = function(block) { if (block.isShadow() && block.getParent()) { this.svgPath.setAttribute('stroke', block.getParent().style.colourTertiary); } + + // Apply colour to outlines. + for (var i = 0, keys = Object.keys(this.outlines_), + key; (key = keys[i]); i++) { + this.outlines_[key].setAttribute('fill', this.style.colourTertiary); + } }; /**