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

Consider min height and min width in row measure

Browse Source
This commit is contained in:
Rachel Fenichel
2019-08-19 13:30:41 -07:00
parent efdf80c49c
commit 450ac4ba15
1 changed files with 25 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
core/renderers/measurables/rows.js
View File

@@ -74,6 +74,21 @@ Blockly.blockRendering.Row = function() {
*/
this.width = 0;
/**
* The minimum height of the row.
* @package
* @type {number}
*/
this.minHeight = 0;
/**
* The minimum width of the row, from the left edge of the block to the right.
* Does not include child blocks unless they are inline.
* @package
* @type {number}
*/
this.minWidth = 0;
/**
* The width of the row, from the left edge of the block to the edge of the
* block or any connected child blocks.
@@ -246,9 +261,9 @@ Blockly.blockRendering.TopRow = function(block) {
// This is the minimum height for the row. If one of its elements has a
// greater height it will be overwritten in the compute pass.
if (precedesStatement && !block.isCollapsed()) {
this.height = Blockly.blockRendering.constants.LARGE_PADDING;
this.minHeight = Blockly.blockRendering.constants.LARGE_PADDING;
} else {
this.height = Blockly.blockRendering.constants.MEDIUM_PADDING;
this.minHeight = Blockly.blockRendering.constants.MEDIUM_PADDING;
}
};
goog.inherits(Blockly.blockRendering.TopRow, Blockly.blockRendering.Row);
@@ -271,8 +286,8 @@ Blockly.blockRendering.TopRow.prototype.getPreviousConnection = function() {
* @override
*/
Blockly.blockRendering.TopRow.prototype.measure = function() {
this.width = 0;
this.height = 0;
this.width = this.minWidth;
this.height = this.minHeight;
for (var e = 0; e < this.elements.length; e++) {
var elem = this.elements[e];
this.width += elem.width;
@@ -334,9 +349,9 @@ Blockly.blockRendering.BottomRow = function(block) {
// This is the minimum height for the row. If one of its elements has a greater
// height it will be overwritten in the compute pass.
if (followsStatement) {
this.height = Blockly.blockRendering.constants.LARGE_PADDING;
this.minHeight = Blockly.blockRendering.constants.LARGE_PADDING;
} else {
this.height = this.notchShape.height;
this.minHeight = this.notchShape.height;
}
};
goog.inherits(Blockly.blockRendering.BottomRow,
@@ -360,8 +375,8 @@ Blockly.blockRendering.BottomRow.prototype.getNextConnection = function() {
* @override
*/
Blockly.blockRendering.BottomRow.prototype.measure = function() {
this.width = 0;
this.height = 0;
this.width = this.minWidth;
this.height = this.minHeight;
for (var e = 0; e < this.elements.length; e++) {
var elem = this.elements[e];
this.width += elem.width;
@@ -419,8 +434,8 @@ goog.inherits(Blockly.blockRendering.InputRow,
* @package
*/
Blockly.blockRendering.InputRow.prototype.measure = function() {
this.width = 0;
this.height = 0;
this.width = this.minWidth;
this.height = this.minHeight;
var connectedBlockWidths = 0;
for (var e = 0; e < this.elements.length; e++) {
var elem = this.elements[e];