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

Merge pull request #2852 from rachel-fenichel/populate_rows

Browse Source 
Guarantee that the top and bottom rows exist
This commit is contained in:
Rachel Fenichel
2019-08-16 17:59:29 -07:00
committed by GitHub
parent b66f3aa74a b42214abd1
commit 64a5da9159
1 changed files with 16 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
core/renderers/block_rendering_rewrite/block_render_info.js
View File

@@ -105,7 +105,7 @@ Blockly.blockRendering.RenderInfo = function(block) {
/**
* An array of Row objects containing sizing information.
* @type {Array}
* @type {!Array.<!Blockly.blockRendering.Row>}
*/
this.rows = [];
@@ -115,8 +115,17 @@ Blockly.blockRendering.RenderInfo = function(block) {
*/
this.hiddenIcons = [];
this.topRow = null;
this.bottomRow = null;
/**
* An object with rendering information about the top row of the block.
* @type {!Blockly.blockRendering.TopRow}
*/
this.topRow = new Blockly.blockRendering.TopRow(this.block_);
/**
* An object with rendering information about the bottom row of the block.
* @type {!Blockly.blockRendering.BottomRow}
*/
this.bottomRow = new Blockly.blockRendering.BottomRow(this.block_);
// The position of the start point for drawing, relative to the block's
// location.
@@ -153,7 +162,7 @@ Blockly.blockRendering.RenderInfo.prototype.measure_ = function() {
* @private
*/
Blockly.blockRendering.RenderInfo.prototype.createRows_ = function() {
this.createTopRow_();
this.populateTopRow_();
this.rows.push(this.topRow);
var activeRow = new Blockly.blockRendering.Row();
@@ -203,7 +212,7 @@ Blockly.blockRendering.RenderInfo.prototype.createRows_ = function() {
if (activeRow.elements.length) {
this.rows.push(activeRow);
}
this.createBottomRow_();
this.populateBottomRow_();
this.rows.push(this.bottomRow);
};
@@ -211,13 +220,12 @@ Blockly.blockRendering.RenderInfo.prototype.createRows_ = function() {
* Create the top row and fill the elements list with all non-spacer elements
* created.
*/
Blockly.blockRendering.RenderInfo.prototype.createTopRow_ = function() {
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 prevBlock = this.block_.getPreviousBlock();
var squareCorner = !!this.block_.outputConnection ||
hasHat || (prevBlock && prevBlock.getNextBlock() == this.block_);
this.topRow = new Blockly.blockRendering.TopRow(this.block_);
if (squareCorner) {
this.topRow.elements.push(new Blockly.blockRendering.SquareCorner());
@@ -238,9 +246,8 @@ Blockly.blockRendering.RenderInfo.prototype.createTopRow_ = function() {
* Create the bottom row and fill the elements list with all non-spacer elements
* created.
*/
Blockly.blockRendering.RenderInfo.prototype.createBottomRow_ = function() {
Blockly.blockRendering.RenderInfo.prototype.populateBottomRow_ = function() {
var squareCorner = !!this.block_.outputConnection || !!this.block_.getNextBlock();
this.bottomRow = new Blockly.blockRendering.BottomRow(this.block_);
if (squareCorner) {
this.bottomRow.elements.push(new Blockly.blockRendering.SquareCorner());