Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix(controls) correct position for offsets #6250

Merged
merged 2 commits into from
Apr 5, 2020
Merged

fix(controls) correct position for offsets #6250

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7359ce5
more changes
asturur Apr 5, 2020
ddaafa4
more changes
asturur Apr 5, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 4 additions & 24 deletions src/control.class.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -197,30 +197,10 @@
},


positionHandler: function(dim, finalMatrix, fabricObject /* currentControl */ ) {
var padding = fabricObject.padding, angle = util.degreesToRadians(fabricObject.angle),
cos = util.cos(angle), sin = util.sin(angle), offsetX = this.offsetX,
offsetY = this.offsetY, cosP = cos * padding, sinP = sin * padding, cosY = cos * offsetY,
cosX = cos * offsetX, sinY = sin * offsetY, sinX = sin * offsetX,
point = util.transformPoint({
x: this.x * dim.x,
y: this.y * dim.y }, finalMatrix);
if (this.x > 0) {
point.x += cosP + cosX - sinY;
point.y += sinP + sinX + cosY;
}
if (this.x < 0) {
point.x += -cosP + cosX - sinY;
point.y += -sinP + sinX + cosY;
}
if (this.y > 0) {
point.x += -sinP + cosX - sinY;
point.y += cosP + sinX + cosY;
}
if (this.y < 0) {
point.x += sinP + cosX - sinY;
point.y += -cosP - sinX + cosY;
}
positionHandler: function(dim, finalMatrix /*, fabricObject, currentControl */) {
var point = util.transformPoint({
x: this.x * dim.x + this.offsetX,
y: this.y * dim.y + this.offsetY }, finalMatrix);
return point;
},

Expand Down
37 changes: 19 additions & 18 deletions src/mixins/object_geometry.mixin.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,12 @@
];
}

var degreesToRadians = fabric.util.degreesToRadians,
multiplyMatrices = fabric.util.multiplyTransformMatrices,
transformPoint = fabric.util.transformPoint;
var util = fabric.util,
degreesToRadians = util.degreesToRadians,
multiplyMatrices = util.multiplyTransformMatrices,
transformPoint = util.transformPoint;

fabric.util.object.extend(fabric.Object.prototype, /** @lends fabric.Object.prototype */ {
util.object.extend(fabric.Object.prototype, /** @lends fabric.Object.prototype */ {

/**
* Describe object's corner position in canvas element coordinates.
Expand Down Expand Up @@ -322,7 +323,7 @@
*/
getBoundingRect: function(absolute, calculate) {
var coords = this.getCoords(absolute, calculate);
return fabric.util.makeBoundingBoxFromPoints(coords);
return util.makeBoundingBoxFromPoints(coords);
},

/**
Expand Down Expand Up @@ -419,7 +420,7 @@
if (!this.aCoords) { this.aCoords = this.calcACoords(); }
var vpt = this.getViewportTransform();
var padding = this.padding, angle = degreesToRadians(this.angle),
cos = fabric.util.cos(angle), sin = fabric.util.sin(angle),
cos = util.cos(angle), sin = util.sin(angle),
cosP = cos * padding, sinP = sin * padding, cosPSinP = cosP + sinP,
cosPMinusSinP = cosP - sinP, aCoords = this.aCoords;

Expand Down Expand Up @@ -452,15 +453,16 @@
},

calcOCoords: function() {
var rotateMatrix = this._calcRotateMatrix(),
translateMatrix = this._calcTranslateMatrix(),
startMatrix = multiplyMatrices(translateMatrix, rotateMatrix),
var matrix = this.calcTransformMatrix(),
vpt = this.getViewportTransform(),
finalMatrix = multiplyMatrices(vpt, startMatrix),
dim = this._getTransformedDimensions(),
options = util.qrDecompose(multiplyMatrices(vpt, matrix));
options.scaleX = 1;
options.scaleY = 1;
var finalMatrix = util.composeMatrix(options),
dim = this._calculateCurrentDimensions(),
coords = {};
this.forEachControl(function(control, key, fabricObject) {
coords[key] = control.positionHandler(dim, finalMatrix, fabricObject);
coords[key] = control.positionHandler(dim, finalMatrix, fabricObject, control);
});

// debug code
Expand Down Expand Up @@ -517,7 +519,7 @@
* @return {Array} rotation matrix for the object
*/
_calcRotateMatrix: function() {
return fabric.util.calcRotateMatrix(this);
return util.calcRotateMatrix(this);
},

/**
Expand Down Expand Up @@ -576,7 +578,7 @@
this.translateX = tMatrix[4];
this.translateY = tMatrix[5];
cache.key = key;
cache.value = fabric.util.composeMatrix(this);
cache.value = util.composeMatrix(this);
return cache.value;
},

Expand All @@ -589,7 +591,7 @@
* @return {Object} .y height dimension
*/
_calcDimensionsTransformMatrix: function(skewX, skewY, flipping) {
return fabric.util.calcDimensionsMatrix({
return util.calcDimensionsMatrix({
skewX: skewX,
skewY: skewY,
scaleX: this.scaleX * (flipping && this.flipX ? -1 : 1),
Expand Down Expand Up @@ -660,13 +662,13 @@
x: dimX,
y: dimY
}],
transformMatrix = fabric.util.calcDimensionsMatrix({
transformMatrix = util.calcDimensionsMatrix({
scaleX: this.scaleX,
scaleY: this.scaleY,
skewX: skewX,
skewY: skewY,
}),
bbox = fabric.util.makeBoundingBoxFromPoints(points, transformMatrix);
bbox = util.makeBoundingBoxFromPoints(points, transformMatrix);
return this._finalizeDimensions(bbox.width, bbox.height);
},

Expand All @@ -692,7 +694,6 @@
var vpt = this.getViewportTransform(),
dim = this._getTransformedDimensions(),
p = transformPoint(dim, vpt, true);

return p.scalarAdd(2 * this.padding);
},
});
Expand Down