Hopiu/fabric.js
1
0
Fork 0
mirror of https://github.com/Hopiu/fabric.js.git synced 2026-04-22 15:04:41 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix scale equally and double flip not happening (#4313)

Browse source 
* fix double flip

* fixed lint
This commit is contained in:
Andrea Bogazzi 2017-09-16 22:11:50 +02:00 committed by GitHub
parent 1b8786c706
commit 9bd5e90840
1 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/canvas.class.js
View file

@ -879,12 +879,13 @@
var dist = localMouse.y + localMouse.x,
lastDist = _dim.y * transform.original.scaleY / target.scaleY +
_dim.x * transform.original.scaleX / target.scaleX,
scaled;
scaled, signX = localMouse.x / Math.abs(localMouse.x),
signY = localMouse.y / Math.abs(localMouse.y);
// We use transform.scaleX/Y instead of target.scaleX/Y
// because the object may have a min scale and we'll loose the proportions
transform.newScaleX = transform.original.scaleX * dist / lastDist;
transform.newScaleY = transform.original.scaleY * dist / lastDist;
transform.newScaleX = signX * Math.abs(transform.original.scaleX * dist / lastDist);
transform.newScaleY = signY * Math.abs(transform.original.scaleY * dist / lastDist);
scaled = transform.newScaleX !== target.scaleX || transform.newScaleY !== target.scaleY;
target.set('scaleX', transform.newScaleX);
target.set('scaleY', transform.newScaleY);