Skip to content

Commit

Permalink
add global zoom information to setLocalMouse (#3671)
Browse files Browse the repository at this point in the history
  • Loading branch information
asturur authored Feb 7, 2017
1 parent c378fa5 commit e6cdd46
Showing 1 changed file with 8 additions and 7 deletions.
15 changes: 8 additions & 7 deletions src/canvas.class.js
Original file line number Diff line number Diff line change
Expand Up @@ -899,7 +899,8 @@
* @private
*/
_setLocalMouse: function(localMouse, t) {
var target = t.target;
var target = t.target, zoom = this.getZoom(),
padding = target.padding / zoom;

if (t.originX === 'right') {
localMouse.x *= -1;
Expand All @@ -922,24 +923,24 @@
}

// adjust the mouse coordinates when dealing with padding
if (abs(localMouse.x) > target.padding) {
if (abs(localMouse.x) > padding) {
if (localMouse.x < 0) {
localMouse.x += target.padding;
localMouse.x += padding;
}
else {
localMouse.x -= target.padding;
localMouse.x -= padding;
}
}
else { // mouse is within the padding, set to 0
localMouse.x = 0;
}

if (abs(localMouse.y) > target.padding) {
if (abs(localMouse.y) > padding) {
if (localMouse.y < 0) {
localMouse.y += target.padding;
localMouse.y += padding;
}
else {
localMouse.y -= target.padding;
localMouse.y -= padding;
}
}
else {
Expand Down

0 comments on commit e6cdd46

Please sign in to comment.