CodingPirates/blockly
1
0
Fork 0
mirror of https://github.com/google/blockly.git synced 2026-01-08 17:40:09 +01:00
Code Issues Packages Projects Releases Wiki Activity

Only add a hat if there's no output connection or previous connection (#3280)

Browse Source 
* Only add a hat if there's no output connection or previous connection
This commit is contained in:
Sam El-Husseini
2019-10-17 14:08:06 -05:00
committed by GitHub
parent ce02665044
commit 36524a3b4a
2 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -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) {

3
core/renderers/measurables/rows.js
View File

@@ -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 ||