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

Cleanup

Browse Source
This commit is contained in:
Rachel Fenichel
2019-08-08 17:08:24 -07:00
parent 67d6a2f4f8
commit caec821fec
3 changed files with 18 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
core/renderers/block_rendering_rewrite/block_render_draw.js
View File

@@ -194,10 +194,11 @@ Blockly.blockRendering.Drawer.prototype.drawStatementInput_ = function(row) {
this.highlighter_.drawStatementInput(row);
}
// Where to start drawing the notch, which is on the right side in LTR.
var x = row.statementEdge + Blockly.blockRendering.constants.NOTCH_OFFSET_LEFT +
var x = this.info_.startX + row.statementEdge +
Blockly.blockRendering.constants.NOTCH_OFFSET_LEFT +
Blockly.blockRendering.constants.NOTCH.width;
this.steps_.push('H', this.info_.startX + x);
this.steps_.push('H', x);
var innerTopLeftCorner =
Blockly.blockRendering.constants.NOTCH.pathRight + ' h -' +

30
core/renderers/block_rendering_rewrite/block_render_draw_highlight.js
View File

@@ -92,7 +92,8 @@ Blockly.blockRendering.Highlighter.prototype.drawTopCorner = function(row) {
}
}
this.steps_.push('H', this.info_.startX + row.width - this.highlightOffset_);
var right = this.info_.startX + row.width - this.highlightOffset_;
this.steps_.push('H', right);
};
Blockly.blockRendering.Highlighter.prototype.drawJaggedEdge_ = function(row) {
@@ -109,14 +110,11 @@ Blockly.blockRendering.Highlighter.prototype.drawValueInput = function(row) {
var input = row.getLastInput();
var steps = '';
if (this.RTL_) {
var aboveTabHeight = 0;
var belowTabHeight =
row.height - input.connectionHeight;
var belowTabHeight = row.height - input.connectionHeight;
steps =
Blockly.utils.svgPaths.moveTo(
this.info_.startX + row.width - this.highlightOffset_, row.yPos) +
Blockly.utils.svgPaths.lineOnAxis('v', aboveTabHeight) +
this.puzzleTabPaths_.pathDown(this.RTL_) +
Blockly.utils.svgPaths.lineOnAxis('v', belowTabHeight);
} else {
@@ -130,29 +128,29 @@ Blockly.blockRendering.Highlighter.prototype.drawValueInput = function(row) {
Blockly.blockRendering.Highlighter.prototype.drawStatementInput = function(row) {
var steps = '';
var statementEdge = this.info_.startX + row.statementEdge;
if (this.RTL_) {
var innerHeight = row.height - (2 * this.insideCornerPaths_.height);
steps =
Blockly.utils.svgPaths.moveTo(
this.info_.startX + row.statementEdge, row.yPos) +
Blockly.utils.svgPaths.moveTo(statementEdge, row.yPos) +
this.insideCornerPaths_.pathTop(this.RTL_) +
Blockly.utils.svgPaths.lineOnAxis('v', innerHeight) +
this.insideCornerPaths_.pathBottom(this.RTL_);
} else {
steps =
Blockly.utils.svgPaths.moveTo(
this.info_.startX + row.statementEdge, row.yPos + row.height) +
Blockly.utils.svgPaths.moveTo(statementEdge, row.yPos + row.height) +
this.insideCornerPaths_.pathBottom(this.RTL_);
}
this.steps_.push(steps);
};
Blockly.blockRendering.Highlighter.prototype.drawRightSideRow = function(row) {
var rightEdge = this.info_.startX + row.width - this.highlightOffset_;
if (row.followsStatement) {
this.steps_.push('H', this.info_.startX + row.width - this.highlightOffset_);
this.steps_.push('H', rightEdge);
}
if (this.RTL_) {
this.steps_.push('H', this.info_.startX + row.width - this.highlightOffset_);
this.steps_.push('H', rightEdge);
this.steps_.push('v', row.height - this.highlightOffset_);
}
};
@@ -169,7 +167,8 @@ Blockly.blockRendering.Highlighter.prototype.drawBottomRow = function(row) {
if (cornerElem.type === 'square corner') {
this.steps_.push(
Blockly.utils.svgPaths.moveTo(
this.info_.startX + this.highlightOffset_, height - this.highlightOffset_));
this.info_.startX + this.highlightOffset_,
height - this.highlightOffset_));
} else if (cornerElem.type === 'round corner') {
this.steps_.push(Blockly.utils.svgPaths.moveTo(this.info_.startX, height));
this.steps_.push(this.outsideCornerPaths_.bottomLeft());
@@ -184,10 +183,9 @@ Blockly.blockRendering.Highlighter.prototype.drawLeft = function() {
outputConnection.connectionOffsetY + outputConnection.height;
// Draw a line up to the bottom of the tab.
if (!this.RTL_) {
this.steps_.push(
Blockly.utils.svgPaths.moveTo(
this.info_.startX + this.highlightOffset_,
this.info_.startY + this.info_.height - this.highlightOffset_));
var left = this.info_.startX + this.highlightOffset_;
var bottom = this.info_.startY + this.info_.height - this.highlightOffset_;
this.steps_.push(Blockly.utils.svgPaths.moveTo(left, bottom));
this.steps_.push('V', tabBottom);
} else {
this.steps_.push(Blockly.utils.svgPaths.moveTo(this.info_.startX, tabBottom));

2
tests/playground.html
View File

@@ -122,7 +122,7 @@ function start() {
{
controls: true,
wheel: true,
startScale: 2.0,
startScale: 1.0,
maxScale: 4,
minScale: 0.25,
scaleSpeed: 1.1