scratchfoundation/scratch-vm
1
0
Fork 0
mirror of https://github.com/scratchfoundation/scratch-vm.git synced 2024-12-23 14:32:59 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Check that bubble bounds do not extend past stage boundaries

Browse source 
For when you can't flip the bubble, but need it to remain on-stage
This commit is contained in:
Connor Hudson 2018-06-05 15:58:03 -04:00
parent ca6a7f9311
commit 25290e7f6a
1 changed files with 9 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
src/blocks/scratch3_looks.js
View file

@ -153,10 +153,17 @@ class Scratch3LooksBlocks {
this.runtime.renderer.updateDrawableProperties(bubbleState.drawableId, { this.runtime.renderer.updateDrawableProperties(bubbleState.drawableId, {
position: [ position: [
bubbleState.onSpriteRight ? ( bubbleState.onSpriteRight ? (
Math.min(stageBounds.right - bubbleWidth, targetBounds.right) Math.max(
stageBounds.left, // Bubble should not extend past left edge of stage
Math.min(stageBounds.right - bubbleWidth, targetBounds.right)
)
) : ( ) : (
Math.max(stageBounds.left, targetBounds.left - bubbleWidth) Math.min(
stageBounds.right - bubbleWidth, // Bubble should not extend past right edge of stage
Math.max(stageBounds.left, targetBounds.left - bubbleWidth)
)
), ),
// Bubble should not extend past the top of the stage
Math.min(stageBounds.top, targetBounds.bottom + bubbleHeight) Math.min(stageBounds.top, targetBounds.bottom + bubbleHeight)
] ]
}); });