scratchfoundation/paper.js
1
0
Fork 0
mirror of https://github.com/scratchfoundation/paper.js.git synced 2025-01-05 20:32:00 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Do not change cashed decomposed matrix data when transforming content.

Browse source 
Just clear the cache and force new decomposition on next use, to avoid issues with nested applied transforms.

Closes #1004
This commit is contained in:
Jürg Lehni 2016-06-14 15:16:45 +02:00
parent 2551027d17
commit f6b77b7442
1 changed files with 3 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
src/item/Item.js
View file

@ -1077,12 +1077,7 @@ new function() { // Injection scope for various item event handlers
setRotation: function(rotation) { setRotation: function(rotation) {
var current = this.getRotation(); var current = this.getRotation();
if (current != null && rotation != null) { if (current != null && rotation != null) {
// Preserve the cached _decomposed values over rotation, and only
// update the rotation property on it.
var decomposed = this._decomposed;
this.rotate(rotation - current); this.rotate(rotation - current);
decomposed.rotation = rotation;
this._decomposed = decomposed;
} }
}, },
@ -1101,15 +1096,11 @@ new function() { // Injection scope for various item event handlers
}, },
setScaling: function(/* scaling */) { setScaling: function(/* scaling */) {
var current = this.getScaling(); var current = this.getScaling(),
if (current) {
// Clone existing points since we're caching internally. // Clone existing points since we're caching internally.
var scaling = Point.read(arguments, 0, { clone: true }), scaling = Point.read(arguments, 0, { clone: true, readNull: true })
// See #setRotation() for preservation of _decomposed. if (current && scaling) {
decomposed = this._decomposed;
this.scale(scaling.x / current.x, scaling.y / current.y); this.scale(scaling.x / current.x, scaling.y / current.y);
decomposed.scaling = scaling;
this._decomposed = decomposed;
} }
}, },