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

Fix offset of comments in stacks

Browse source
This commit is contained in:
Paul Kaplan 2019-12-18 15:42:06 -05:00
parent a62267d154
commit e2b6636011
1 changed files with 9 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

21
core/scratch_block_comment.js
View file

@ -313,20 +313,17 @@ Blockly.ScratchBlockComment.prototype.autoPosition_ = function() {
this.iconXY_.x + minimizedOffset;
this.y_ = this.iconXY_.y - (Blockly.ScratchBubble.TOP_BAR_HEIGHT / 2);
} else {
// Check if the width of this block (and all it's children/descendents) is the
// same as the width of just this block
var fullStackWidth = Math.floor(this.block_.getHeightWidth().width);
// Position comment so that the expanded bubble does not overlap
// blocks below it in the stack that are wider than this block
// Overhang is the difference between this blocks trailing edge and
// the largest block below (zero if this block is the widest)
var thisBlockWidth = Math.floor(this.block_.svgPath_.getBBox().width);
var fullStackWidth = Math.floor(this.block_.getHeightWidth().width);
var overhang = fullStackWidth - thisBlockWidth;
var offset = 8 * Blockly.BlockSvg.GRID_UNIT;
if (fullStackWidth == thisBlockWidth && !this.block_.parentBlock_) {
this.x_ = this.block_.RTL ?
this.iconXY_.x - this.width_ - offset :
this.iconXY_.x + offset;
} else {
this.x_ = this.block_.RTL ?
this.iconXY_.x - this.width_ - fullStackWidth - offset :
this.iconXY_.x + fullStackWidth + offset;
}
this.x_ = this.block_.RTL ?
this.iconXY_.x - this.width_ - overhang - offset :
this.iconXY_.x + overhang + offset;
this.y_ = this.iconXY_.y - (Blockly.ScratchBubble.TOP_BAR_HEIGHT / 2);
}
};