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

Use Rect in more places.

Browse Source
This commit is contained in:
Neil Fraser
2019-06-07 02:51:25 -07:00
committed by Neil Fraser
parent 6947010c49
commit 0213de11bc
4 changed files with 17 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
core/block_svg.js
View File

@@ -40,6 +40,7 @@ goog.require('Blockly.Touch');
goog.require('Blockly.utils');
goog.require('Blockly.utils.Coordinate');
goog.require('Blockly.utils.dom');
goog.require('Blockly.utils.Rect');
/**
@@ -469,8 +470,7 @@ Blockly.BlockSvg.prototype.snapToGrid = function() {
* Returns the coordinates of a bounding box describing the dimensions of this
* block and any blocks stacked below it.
* Coordinate system: workspace coordinates.
* @return {!{top: number, bottom: number, left: number, right: number}}
* Object with top, bottom, left, and right coordinates of the bounding box.
* @return {!Blockly.utils.Rect} Object with coordinates of the bounding box.
*/
Blockly.BlockSvg.prototype.getBoundingRectangle = function() {
var blockXY = this.getRelativeToSurfaceXY(this);
@@ -492,7 +492,7 @@ Blockly.BlockSvg.prototype.getBoundingRectangle = function() {
// Width has the tab built into it already so subtract it here.
right = blockXY.x + blockBounds.width - tab;
}
return {top: top, bottom: bottom, left: left, right: right};
return new Blockly.utils.Rect(top, bottom, left, right);
};
/**

3
core/inject.js
View File

@@ -312,8 +312,7 @@ Blockly.createMainWorkspace_ = function(svg, options, blockDragSurface,
}
// Bump any object that's below the bottom back inside.
var overflowBottom =
metrics.viewBottom - objectMetrics.bottom;
var overflowBottom = metrics.viewBottom - objectMetrics.bottom;
if (overflowBottom < 0) {
object.moveBy(0, overflowBottom);
}

6
core/workspace_comment_svg.js
View File

@@ -34,6 +34,7 @@ goog.require('Blockly.Events.Ui');
goog.require('Blockly.utils');
goog.require('Blockly.utils.Coordinate');
goog.require('Blockly.utils.dom');
goog.require('Blockly.utils.Rect');
goog.require('Blockly.WorkspaceComment');
@@ -419,8 +420,7 @@ Blockly.WorkspaceCommentSvg.prototype.clearTransformAttributes_ = function() {
* Returns the coordinates of a bounding box describing the dimensions of this
* comment.
* Coordinate system: workspace coordinates.
* @return {!{top: number, bottom: number, left: number, right: number}}
* Object with top, bottom, left, and right coordinates of the bounding box.
* @return {!Blockly.utils.Rect} Object with coordinates of the bounding box.
* @package
*/
Blockly.WorkspaceCommentSvg.prototype.getBoundingRectangle = function() {
@@ -440,7 +440,7 @@ Blockly.WorkspaceCommentSvg.prototype.getBoundingRectangle = function() {
left = blockXY.x;
right = blockXY.x + commentBounds.width;
}
return {top: top, bottom: bottom, left: left, right: right};
return new Blockly.utils.Rect(top, bottom, left, right);
};
/**

19
core/workspace_svg.js
View File

@@ -43,6 +43,7 @@ goog.require('Blockly.Trashcan');
goog.require('Blockly.utils');
goog.require('Blockly.utils.Coordinate');
goog.require('Blockly.utils.dom');
goog.require('Blockly.utils.Rect');
goog.require('Blockly.VariablesDynamic');
goog.require('Blockly.Workspace');
goog.require('Blockly.WorkspaceAudio');
@@ -1352,8 +1353,8 @@ Blockly.WorkspaceSvg.prototype.onMouseWheel_ = function(e) {
* Calculate the bounding box for the blocks on the workspace.
* Coordinate system: workspace coordinates.
*
* @return {Object} Contains the position and size of the bounding box
* containing the blocks on the workspace.
* @return {!Blockly.utils.Rect} Contains the position and size of the
* bounding box containing the blocks on the workspace.
*/
Blockly.WorkspaceSvg.prototype.getBlocksBoundingBox = function() {
var topBlocks = this.getTopBlocks(false);
@@ -1361,7 +1362,7 @@ Blockly.WorkspaceSvg.prototype.getBlocksBoundingBox = function() {
var topElements = topBlocks.concat(topComments);
// There are no blocks, return empty rectangle.
if (!topElements.length) {
return {top: 0, bottom: 0, left: 0, right: 0};
return new Blockly.utils.Rect(0, 0, 0, 0);
}
// Initialize boundary using the first block.
@@ -1370,18 +1371,18 @@ Blockly.WorkspaceSvg.prototype.getBlocksBoundingBox = function() {
// Start at 1 since the 0th block was used for initialization.
for (var i = 1; i < topElements.length; i++) {
var blockBoundary = topElements[i].getBoundingRectangle();
if (blockBoundary.left < boundary.left) {
boundary.left = blockBoundary.left;
}
if (blockBoundary.right > boundary.right) {
boundary.right = blockBoundary.right;
}
if (blockBoundary.top < boundary.top) {
boundary.top = blockBoundary.top;
}
if (blockBoundary.bottom > boundary.bottom) {
boundary.bottom = blockBoundary.bottom;
}
if (blockBoundary.left < boundary.left) {
boundary.left = blockBoundary.left;
}
if (blockBoundary.right > boundary.right) {
boundary.right = blockBoundary.right;
}
}
return boundary;
};