scratchfoundation/scratch-blocks
1
0
Fork 0
mirror of https://github.com/scratchfoundation/scratch-blocks.git synced 2025-08-28 22:10:31 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Offset pasted block if in range of a snap connection.

Browse source
This commit is contained in:
carlosperate 2015-07-04 05:34:59 +01:00
parent d8a72df17f
commit bfd3834e7d
1 changed files with 22 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

29
core/workspace_svg.js
View file

@ -396,7 +396,8 @@ Blockly.WorkspaceSvg.prototype.paste = function(xmlBlock) {
if (this.RTL) {
blockX = -blockX;
}
// Offset block until not clobbering another block.
// Offset block until not clobbering another block and not in connection
// distance with neighbouring blocks.
do {
var collide = false;
var allBlocks = this.getAllBlocks();
@ -404,15 +405,29 @@ Blockly.WorkspaceSvg.prototype.paste = function(xmlBlock) {
var otherXY = otherBlock.getRelativeToSurfaceXY();
if (Math.abs(blockX - otherXY.x) <= 1 &&
Math.abs(blockY - otherXY.y) <= 1) {
if (this.RTL) {
blockX -= Blockly.SNAP_RADIUS;
} else {
blockX += Blockly.SNAP_RADIUS;
}
blockY += Blockly.SNAP_RADIUS * 2;
collide = true;
}
}
if (!collide) {
// Check for blocks in snap range to any of its connections
var blockConnections = block.getConnections_(false);
for (var i = 0; i < blockConnections.length; i++) {
var blockConnection = blockConnections[i];
var neighbour =
blockConnection.closest(Blockly.SNAP_RADIUS, blockX, blockY);
if (neighbour.connection) {
collide = true;
}
}
}
if (collide) {
if (this.RTL) {
blockX -= Blockly.SNAP_RADIUS;
} else {
blockX += Blockly.SNAP_RADIUS;
}
blockY += Blockly.SNAP_RADIUS * 2;
}
} while (collide);
block.moveBy(blockX, blockY);
}