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

Using centerline for debug rendering.

Browse Source
This commit is contained in:
kozbial
2019-07-25 11:10:12 -07:00
parent 15ca31650f
commit 5a5d0b698a
2 changed files with 19 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -83,24 +83,22 @@ Blockly.blockRendering.Debug.prototype.drawSpacerRow = function(row, cursorY) {
* Draw a debug rectangle for a horizontal spacer.
* @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, 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_));
};
Blockly.blockRendering.Debug.prototype.drawSpacerElem = function(elem, cursorX, rowHeight) {
var debugRenderedHeight = Math.min(elem.height, rowHeight);
var yPos = elem.centerline - 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.
@@ -109,8 +107,8 @@ Blockly.blockRendering.Debug.prototype.drawSpacerElem =
* @param {number} centerY The y position of the center of the row, vertically.
* @package
*/
Blockly.blockRendering.Debug.prototype.drawRenderedElem = function(elem, cursorX, centerY) {
var yPos = centerY - elem.height / 2;
Blockly.blockRendering.Debug.prototype.drawRenderedElem = function(elem, cursorX) {
var yPos = elem.centerline - elem.height / 2;
this.debugElements_.push(Blockly.utils.dom.createSvgElement('rect',
{
'class': 'rowRenderingRect blockRenderDebug',
@@ -191,14 +189,13 @@ Blockly.blockRendering.Debug.prototype.drawRenderedRow = function(row, cursorY)
* @package
*/
Blockly.blockRendering.Debug.prototype.drawRowWithElements = function(row, cursorY) {
var centerY = cursorY + row.height / 2;
var cursorX = 0;
for (var e = 0; e < row.elements.length; e++) {
var elem = row.elements[e];
if (elem.isSpacer()) {
this.drawSpacerElem(elem, cursorX, centerY, row.height);
this.drawSpacerElem(elem, cursorX, row.height);
} else {
this.drawRenderedElem(elem, cursorX, centerY);
this.drawRenderedElem(elem, cursorX);
}
cursorX += elem.width;
}

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

@@ -637,6 +637,8 @@ Blockly.blockRendering.RenderInfo.prototype.getElemCenterline_ = function(row, e
}
} else if (elem.isInlineInput()) {
result += elem.height / 2;
} else if (elem.isNextConnection()) {
result += row.height + elem.height / 2;
} else {
result += (row.height / 2);
}