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

Reduce number of direct references to the constants file

Browse Source
This commit is contained in:
Rachel Fenichel
2019-07-26 16:41:06 -07:00
parent dbea4615e8
commit 64cc3c5de6
3 changed files with 23 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -208,9 +208,9 @@ Blockly.blockRendering.Drawer.prototype.drawBottom_ = function() {
for (var i = elems.length - 1; i >= 0; i--) {
var elem = elems[i];
if (elem.type === 'next connection') {
this.steps_.push('h', (this.RTL ? 0.5 : - 0.5));
//this.steps_.push('h', (this.RTL ? 0.5 : - 0.5));
this.steps_.push(Blockly.blockRendering.constants.NOTCH.pathRight);
this.steps_.push('h', (this.RTL ? -0.5 : 0.5));
//this.steps_.push('h', (this.RTL ? -0.5 : 0.5));
} else if (elem.type === 'square corner') {
this.steps_.push('H 0');
} else if (elem.type === 'round corner') {

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

@@ -54,6 +54,10 @@ Blockly.blockRendering.Highlighter = function(info, pathObject) {
this.highlightInlineSteps_ = this.pathObject_.highlightInlineSteps;
this.highlightOffset_ = Blockly.blockRendering.constants.HIGHLIGHT_OFFSET;
this.outsideCornerPaths_ = Blockly.blockRendering.constants.OUTSIDE_CORNER_HIGHLIGHTS;
this.insideCornerPaths_ = Blockly.blockRendering.constants.INSIDE_CORNER_HIGHLIGHTS;
this.puzzleTabPaths_ = Blockly.blockRendering.constants.PUZZLE_TAB_HIGHLIGHT;
};
Blockly.blockRendering.Highlighter.prototype.drawTopCorner = function(row) {
@@ -62,10 +66,7 @@ Blockly.blockRendering.Highlighter.prototype.drawTopCorner = function(row) {
this.highlightSteps_.push(Blockly.blockRendering.constants.START_POINT_HIGHLIGHT);
} else if (elem.type === 'round corner') {
this.highlightSteps_.push(
Blockly.blockRendering.constants.OUTSIDE_CORNER_HIGHLIGHTS.topLeftStart(
this.info_.RTL));
this.highlightSteps_.push(
Blockly.blockRendering.constants.OUTSIDE_CORNER_HIGHLIGHTS.topLeft);
this.outsideCornerPaths_.topLeft(this.info_.RTL));
} else if (elem.type === 'previous connection') {
this.highlightSteps_.push('h', (this.RTL ? 0.5 : - 0.5));
this.highlightSteps_.push(Blockly.blockRendering.constants.NOTCH.pathLeftHighlight);
@@ -91,14 +92,13 @@ Blockly.blockRendering.Highlighter.prototype.drawValueInput = function(row) {
// Edge above tab.
this.highlightSteps_.push('v', aboveTabHeight);
// Highlight around back of tab.
this.highlightSteps_.push(
Blockly.blockRendering.constants.PUZZLE_TAB_HIGHLIGHT.pathDown(this.info_.RTL));
this.highlightSteps_.push(this.puzzleTabPaths_.pathDown(this.info_.RTL));
// Edge below tab.
this.highlightSteps_.push('v', belowTabHeight);
} else {
this.highlightSteps_.push(Blockly.utils.svgPaths.moveTo(row.width, row.yPos));
this.highlightSteps_.push(
Blockly.blockRendering.constants.PUZZLE_TAB_HIGHLIGHT.pathDown(this.info_.RTL));
this.puzzleTabPaths_.pathDown(this.info_.RTL));
}
};
@@ -108,18 +108,15 @@ Blockly.blockRendering.Highlighter.prototype.drawStatementInput = function(row)
this.highlightSteps_.push('M',
(x + Blockly.blockRendering.constants.DISTANCE_45_OUTSIDE) +
',' + (row.yPos + Blockly.blockRendering.constants.DISTANCE_45_OUTSIDE));
this.highlightSteps_.push(
Blockly.blockRendering.constants.INSIDE_CORNER_HIGHLIGHTS.pathTop(this.info_.RTL));
this.highlightSteps_.push(this.insideCornerPaths_.pathTop(this.info_.RTL));
this.highlightSteps_.push('v',
row.height - 2 * Blockly.blockRendering.constants.CORNER_RADIUS);
this.highlightSteps_.push(
Blockly.blockRendering.constants.INSIDE_CORNER_HIGHLIGHTS.pathBottom(this.info_.RTL));
this.highlightSteps_.push(this.insideCornerPaths_.pathBottom(this.info_.RTL));
} else {
this.highlightSteps_.push('M',
(x + Blockly.blockRendering.constants.DISTANCE_45_OUTSIDE) + ',' +
(row.yPos + row.height - Blockly.blockRendering.constants.DISTANCE_45_OUTSIDE));
this.highlightSteps_.push(
Blockly.blockRendering.constants.INSIDE_CORNER_HIGHLIGHTS.pathBottom(this.info_.RTL));
this.highlightSteps_.push(this.insideCornerPaths_.pathBottom(this.info_.RTL));
}
};
@@ -151,8 +148,7 @@ Blockly.blockRendering.Highlighter.prototype.drawBottomCorner = function(_row) {
}
} else if (elem.type === 'round corner') {
if (!this.info_.RTL) {
this.highlightSteps_.push(
Blockly.blockRendering.constants.OUTSIDE_CORNER_HIGHLIGHTS.bottomLeft(height));
this.highlightSteps_.push(this.outsideCornerPaths_.bottomLeft(height));
}
}
}
@@ -161,7 +157,7 @@ Blockly.blockRendering.Highlighter.prototype.drawBottomCorner = function(_row) {
Blockly.blockRendering.Highlighter.prototype.drawLeft = function() {
if (this.info_.outputConnection) {
this.highlightSteps_.push(
Blockly.blockRendering.constants.PUZZLE_TAB_HIGHLIGHT.pathUp(this.info_.RTL));
this.puzzleTabPaths_.pathUp(this.info_.RTL));
}
if (!this.info_.RTL) {
@@ -196,7 +192,7 @@ Blockly.blockRendering.Highlighter.prototype.drawInlineInput = function(input) {
this.highlightInlineSteps_.push('v', aboveTabHeight);
// Back of tab.
this.highlightInlineSteps_.push(
Blockly.blockRendering.constants.PUZZLE_TAB_HIGHLIGHT.pathDown(this.info_.RTL));
this.puzzleTabPaths_.pathDown(this.info_.RTL));
// Right edge below tab.
this.highlightInlineSteps_.push('v', belowTabHeight);
// Bottom (horizontal).
@@ -213,6 +209,6 @@ Blockly.blockRendering.Highlighter.prototype.drawInlineInput = function(input) {
connectionRight, yPos + input.connectionOffsetY));
// Short highlight glint at bottom of tab.
this.highlightSteps_.push(
Blockly.blockRendering.constants.PUZZLE_TAB_HIGHLIGHT.pathDown(this.info_.RTL));
this.puzzleTabPaths_.pathDown(this.info_.RTL));
}
};

22
core/renderers/block_rendering_rewrite/block_rendering_constants.js
View File

@@ -436,24 +436,16 @@ Blockly.blockRendering.constants.OUTSIDE_CORNER_HIGHLIGHTS = (function() {
Blockly.utils.svgPaths.arc('A', '0 0,1', radius - offset,
Blockly.utils.svgPaths.point(radius, offset));
var bottomLeftCornerStart =
'M ' + distance45inside + ', '; // follow with y pos - distance 45 inside
var bottomLeftCornerMid =
'A ' + (radius - offset) +
',' + (radius - offset) +
' 0 0,1 ' + offset + ','; // follow with y pos - corner radius
return {
topLeft: topLeftCornerHighlight,
topLeftStart: function(rtl) {
return rtl ? topLeftCornerStartRtl : topLeftCornerStartLtr;
topLeft: function(rtl) {
var start = rtl ? topLeftCornerStartRtl : topLeftCornerStartLtr;
return start + topLeftCornerHighlight;
},
bottomLeft: function(yPos) {
return bottomLeftCornerStart + (yPos - distance45inside) +
bottomLeftCornerMid + (yPos - radius);
return Blockly.utils.svgPaths.moveTo(
distance45inside,yPos - distance45inside) +
Blockly.utils.svgPaths.arc('A', '0 0,1', radius - offset,
Blockly.utils.svgPaths.point(offset, yPos - radius));
}
};
})();