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

Merge pull request #3409 from rachel-fenichel/remove_constants

Browse Source 
Delete two leftover constants in block_svg.
This commit is contained in:
Rachel Fenichel
2019-11-06 16:37:16 -08:00
committed by GitHub
parent d49b3400e6 04ddb90680
commit 48a2f823e4
2 changed files with 9 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
core/block_svg.js
View File

@@ -170,13 +170,6 @@ Blockly.BlockSvg.INLINE = -1;
Blockly.BlockSvg.COLLAPSED_WARNING_ID = 'TEMP_COLLAPSED_WARNING_';
// Leftover UI constants from block_render_svg.js.
/**
* Vertical space between elements.
* @const
* @package
*/
// TODO (#3142): Remove.
Blockly.BlockSvg.SEP_SPACE_Y = 10;
/**
* Minimum height of a block.
@@ -186,13 +179,6 @@ Blockly.BlockSvg.SEP_SPACE_Y = 10;
// TODO (#3142): Remove.
Blockly.BlockSvg.MIN_BLOCK_Y = 25;
/**
* Width of horizontal puzzle tab.
* @package
*/
// TODO (#3142): Remove.
Blockly.BlockSvg.TAB_WIDTH = 8;
/**
* Do blocks with no previous or output connections have a 'hat' on top?
* @const
@@ -579,25 +565,17 @@ Blockly.BlockSvg.prototype.snapToGrid = function() {
*/
Blockly.BlockSvg.prototype.getBoundingRectangle = function() {
var blockXY = this.getRelativeToSurfaceXY();
var tab = this.outputConnection ? Blockly.BlockSvg.TAB_WIDTH : 0;
var blockBounds = this.getHeightWidth();
var top = blockXY.y;
var bottom = blockXY.y + blockBounds.height;
var left, right;
if (this.RTL) {
// Width has the tab built into it already so subtract it here.
left = blockXY.x - (blockBounds.width - tab);
// Add the width of the tab/puzzle piece knob to the x coordinate
// since X is the corner of the rectangle, not the whole puzzle piece.
right = blockXY.x + tab;
left = blockXY.x - blockBounds.width;
right = blockXY.x;
} else {
// Subtract the width of the tab/puzzle piece knob to the x coordinate
// since X is the corner of the rectangle, not the whole puzzle piece.
left = blockXY.x - tab;
// Width has the tab built into it already so subtract it here.
right = blockXY.x + blockBounds.width - tab;
left = blockXY.x;
right = blockXY.x + blockBounds.width;
}
return new Blockly.utils.Rect(top, bottom, left, right);
return new Blockly.utils.Rect(
blockXY.y, blockXY.y + blockBounds.height, left, right);
};
/**

11
core/xml.js
View File

@@ -476,13 +476,7 @@ Blockly.Xml.appendDomToWorkspace = function(xml, workspace) {
// First check if we have a workspaceSvg, otherwise the blocks have no shape
// and the position does not matter.
if (workspace.hasOwnProperty('scale')) {
var savetab = Blockly.BlockSvg.TAB_WIDTH;
try {
Blockly.BlockSvg.TAB_WIDTH = 0;
bbox = workspace.getBlocksBoundingBox();
} finally {
Blockly.BlockSvg.TAB_WIDTH = savetab;
}
bbox = workspace.getBlocksBoundingBox();
}
// Load the new blocks into the workspace and get the IDs of the new blocks.
var newBlockIds = Blockly.Xml.domToWorkspace(xml, workspace);
@@ -494,6 +488,7 @@ Blockly.Xml.appendDomToWorkspace = function(xml, workspace) {
// Check position of the new blocks.
var newX = Infinity; // x of top corner
var newY = Infinity; // y of top corner
var ySeparation = 10;
for (var i = 0; i < newBlockIds.length; i++) {
var blockXY =
workspace.getBlockById(newBlockIds[i]).getRelativeToSurfaceXY();
@@ -504,7 +499,7 @@ Blockly.Xml.appendDomToWorkspace = function(xml, workspace) {
newX = blockXY.x;
}
}
offsetY = farY - newY + Blockly.BlockSvg.SEP_SPACE_Y;
offsetY = farY - newY + ySeparation;
offsetX = topX - newX;
// move the new blocks to append them at the bottom
var width; // Not used in LTR.