From 25ce7f416a977dd0fe592815477d823184f001b2 Mon Sep 17 00:00:00 2001 From: Ian Bicking Date: Thu, 13 Oct 2016 15:20:29 -0500 Subject: [PATCH] Fix #1732, don't allow resize to go past the edge of the screen --- addon/data/shooter-interactive-worker.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/addon/data/shooter-interactive-worker.js b/addon/data/shooter-interactive-worker.js index 99bbc487b2..f90b72d45e 100644 --- a/addon/data/shooter-interactive-worker.js +++ b/addon/data/shooter-interactive-worker.js @@ -654,7 +654,7 @@ stateHandlers.resizing = { let moveX = movement[0]; moveX = moveX == "*" ? ["left", "right"] : [moveX]; for (let moveDir of moveX) { - selectedPos[moveDir] = resizeStartSelected[moveDir] + diffX; + selectedPos[moveDir] = util.truncateX(resizeStartSelected[moveDir] + diffX); selectedPos.checkBump(moveDir); } } @@ -662,7 +662,7 @@ stateHandlers.resizing = { let moveY = movement[1]; moveY = moveY == "*" ? ["top", "bottom"] : [moveY]; for (let moveDir of moveY) { - selectedPos[moveDir] = resizeStartSelected[moveDir] + diffY; + selectedPos[moveDir] = util.truncateY(resizeStartSelected[moveDir] + diffY); selectedPos.checkBump(moveDir); } }