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

Fixes for group coordinates (coordinates now also generated before group is added to canvas)

Browse source
This commit is contained in:
Tom French 2014-06-13 11:23:13 +01:00
parent 02b0b20343
commit 5f8e0ee6ee
5 changed files with 15 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
dist/fabric.js vendored
View file

@ -19314,7 +19314,9 @@ fabric.util.object.extend(fabric.Object.prototype, /** @lends fabric.Object.prot
extend(this, options);
}
this._setOpacityIfSame();
//this.setCoords();
this._calcBounds();
this._updateObjectsCoords();
this.setCoords();
this.saveCoords();
},
@ -19699,11 +19701,8 @@ fabric.util.object.extend(fabric.Object.prototype, /** @lends fabric.Object.prot
* @private
*/
_getBounds: function(aX, aY, onlyWidthHeight) {
var ivt;
if (this.canvas) {
ivt = fabric.util.invertTransform(this.getViewportTransform());
}
var minXY = fabric.util.transformPoint(new fabric.Point(min(aX), min(aY)), ivt),
var ivt = fabric.util.invertTransform(this.getViewportTransform()),
minXY = fabric.util.transformPoint(new fabric.Point(min(aX), min(aY)), ivt),
maxXY = fabric.util.transformPoint(new fabric.Point(max(aX), max(aY)), ivt),
obj = {
width: (maxXY.x - minXY.x) || 0,

2
dist/fabric.min.js vendored
View file

File diff suppressed because one or more lines are too long

BIN
dist/fabric.min.js.gz vendored
View file

Binary file not shown.

9
dist/fabric.require.js vendored
View file

@ -9899,6 +9899,9 @@ fabric.util.object.extend(fabric.Object.prototype, {
extend(this, options);
}
this._setOpacityIfSame();
this._calcBounds();
this._updateObjectsCoords();
this.setCoords();
this.saveCoords();
},
_updateObjectsCoords: function() {
@ -10099,11 +10102,7 @@ fabric.util.object.extend(fabric.Object.prototype, {
this.set(this._getBounds(aX, aY, onlyWidthHeight));
},
_getBounds: function(aX, aY, onlyWidthHeight) {
var ivt;
if (this.canvas) {
ivt = fabric.util.invertTransform(this.getViewportTransform());
}
var minXY = fabric.util.transformPoint(new fabric.Point(min(aX), min(aY)), ivt), maxXY = fabric.util.transformPoint(new fabric.Point(max(aX), max(aY)), ivt), obj = {
var ivt = fabric.util.invertTransform(this.getViewportTransform()), minXY = fabric.util.transformPoint(new fabric.Point(min(aX), min(aY)), ivt), maxXY = fabric.util.transformPoint(new fabric.Point(max(aX), max(aY)), ivt), obj = {
width: maxXY.x - minXY.x || 0,
height: maxXY.y - minXY.y || 0
};

11
src/shapes/group.class.js
View file

@ -63,7 +63,9 @@
extend(this, options);
}
this._setOpacityIfSame();
//this.setCoords();
this._calcBounds();
this._updateObjectsCoords();
this.setCoords();
this.saveCoords();
},
@ -448,11 +450,8 @@
* @private
*/
_getBounds: function(aX, aY, onlyWidthHeight) {
var ivt;
if (this.canvas) {
ivt = fabric.util.invertTransform(this.getViewportTransform());
}
var minXY = fabric.util.transformPoint(new fabric.Point(min(aX), min(aY)), ivt),
var ivt = fabric.util.invertTransform(this.getViewportTransform()),
minXY = fabric.util.transformPoint(new fabric.Point(min(aX), min(aY)), ivt),
maxXY = fabric.util.transformPoint(new fabric.Point(max(aX), max(aY)), ivt),
obj = {
width: (maxXY.x - minXY.x) || 0,