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

Merge pull request #2709 from moniika/moniika-render-debug-top-bottom

Browse Source 
Updating debug rendering for top and bottom block rows.
This commit is contained in:
Monica Kozbial
2019-07-25 13:32:24 -07:00
committed by GitHub
parent c1b49a1da7 c858153ea0
commit 15ca31650f
2 changed files with 16 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
core/renderers/block_rendering_rewrite/block_render_draw_debug.js
View File

@@ -84,20 +84,23 @@ Blockly.blockRendering.Debug.prototype.drawSpacerRow = function(row, cursorY) {
* @param {!Blockly.BlockSvg.InRowSpacer} elem The spacer to render
* @param {number} cursorX The x position of the left of the row.
* @param {number} centerY The y position of the center of the row, vertically.
* @param {number} rowHeight The height of the container row.
* @package
*/
Blockly.blockRendering.Debug.prototype.drawSpacerElem = function(elem, cursorX, centerY) {
var yPos = centerY - elem.height / 2;
this.debugElements_.push(Blockly.utils.dom.createSvgElement('rect',
{
'class': 'elemSpacerRect blockRenderDebug',
'x': cursorX,
'y': yPos,
'width': elem.width,
'height': 15,
},
this.svgRoot_));
};
Blockly.blockRendering.Debug.prototype.drawSpacerElem =
function(elem, cursorX, centerY, rowHeight) {
var debugRenderedHeight = Math.min(15, rowHeight);
var yPos = centerY - debugRenderedHeight / 2;
this.debugElements_.push(Blockly.utils.dom.createSvgElement('rect',
{
'class': 'elemSpacerRect blockRenderDebug',
'x': cursorX,
'y': yPos,
'width': elem.width,
'height': debugRenderedHeight,
},
this.svgRoot_));
};
/**
* Draw a debug rectangle for an in-row element.
@@ -193,7 +196,7 @@ Blockly.blockRendering.Debug.prototype.drawRowWithElements = function(row, curso
for (var e = 0; e < row.elements.length; e++) {
var elem = row.elements[e];
if (elem.isSpacer()) {
this.drawSpacerElem(elem, cursorX, centerY);
this.drawSpacerElem(elem, cursorX, centerY, row.height);
} else {
this.drawRenderedElem(elem, cursorX, centerY);
}

10
core/renderers/block_rendering_rewrite/measurables.js
View File

@@ -453,11 +453,6 @@ Blockly.blockRendering.TopRow = function(block) {
};
goog.inherits(Blockly.blockRendering.TopRow, Blockly.blockRendering.Row);
Blockly.blockRendering.TopRow.prototype.isSpacer = function() {
return true;
};
Blockly.blockRendering.BottomRow = function(block) {
Blockly.blockRendering.BottomRow.superClass_.constructor.call(this);
this.type = 'bottom row';
@@ -480,8 +475,3 @@ Blockly.blockRendering.BottomRow = function(block) {
};
goog.inherits(Blockly.blockRendering.BottomRow,
Blockly.blockRendering.Row);
Blockly.blockRendering.BottomRow.prototype.isSpacer = function() {
return true;
};