From 36524a3b4a1d6391bd154648aab780fa14519b2c Mon Sep 17 00:00:00 2001 From: Sam El-Husseini Date: Thu, 17 Oct 2019 14:08:06 -0500 Subject: [PATCH] Only add a hat if there's no output connection or previous connection (#3280) * Only add a hat if there's no output connection or previous connection --- core/renderers/common/info.js | 5 +++-- core/renderers/measurables/rows.js | 3 ++- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/core/renderers/common/info.js b/core/renderers/common/info.js index 6f978889e..f39cc9187 100644 --- a/core/renderers/common/info.js +++ b/core/renderers/common/info.js @@ -253,9 +253,10 @@ Blockly.blockRendering.RenderInfo.prototype.createRows_ = function() { * @package */ Blockly.blockRendering.RenderInfo.prototype.populateTopRow_ = function() { - var hasHat = this.block_.hat ? - this.block_.hat === 'cap' : Blockly.BlockSvg.START_HAT; var hasPrevious = !!this.block_.previousConnection; + var hasHat = (this.block_.hat ? + this.block_.hat === 'cap' : Blockly.BlockSvg.START_HAT) && + !this.outputConnection && !hasPrevious; var leftSquareCorner = this.topRow.hasLeftSquareCorner(this.block_); if (leftSquareCorner) { diff --git a/core/renderers/measurables/rows.js b/core/renderers/measurables/rows.js index b998eb7f3..5f17f96ce 100644 --- a/core/renderers/measurables/rows.js +++ b/core/renderers/measurables/rows.js @@ -283,7 +283,8 @@ Blockly.utils.object.inherits(Blockly.blockRendering.TopRow, * @return {boolean} Whether or not the top row has a left square corner. */ Blockly.blockRendering.TopRow.prototype.hasLeftSquareCorner = function(block) { - var hasHat = block.hat ? block.hat === 'cap' : Blockly.BlockSvg.START_HAT; + var hasHat = (block.hat ? block.hat === 'cap' : Blockly.BlockSvg.START_HAT) && + !block.outputConnection && !block.previousConnection; var prevBlock = block.getPreviousBlock(); return !!block.outputConnection ||