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

small changes (#3908)

Browse source
This commit is contained in:
Andrea Bogazzi 2017-05-06 13:05:07 +02:00 committed by GitHub
parent 19c18a512d
commit 95d07a97ba
2 changed files with 24 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -374,15 +374,16 @@
/**
* Renders controls and borders for the object
* @param {CanvasRenderingContext2D} ctx Context to render on
* @param {Boolean} [noTransform] When true, context is not transformed
* @param {Object} [styleOverride] properties to override the object style
* @param {Object} [childrenOverride] properties to override the children overrides
*/
_renderControls: function(ctx, noTransform) {
_renderControls: function(ctx, styleOverride, childrenOverride) {
ctx.save();
ctx.globalAlpha = this.isMoving ? this.borderOpacityWhenMoving : 1;
this.callSuper('_renderControls', ctx, noTransform);
this.callSuper('_renderControls', ctx, styleOverride);
if (this.canvas && this === this.canvas.getActiveGroup()) {
for (var i = 0, len = this._objects.length; i < len; i++) {
this._objects[i]._renderControls(ctx);
this._objects[i]._renderControls(ctx, childrenOverride);
}
}
ctx.restore();

21
src/shapes/object.class.js
View file

@ -929,7 +929,7 @@
* @param {Boolean} fromLeft When true, context is transformed to object's top/left corner. This is used when rendering text on Node
*/
transform: function(ctx, fromLeft) {
if (this.group && !this.group._transformDone && this.group === this.canvas._activeGroup) {
if (this.group && !this.group._transformDone) {
this.group.transform(ctx);
}
var center = fromLeft ? this._getLeftTopCoords() : this.getCenterPoint();
@ -1047,6 +1047,18 @@
return { scaleX: scaleX, scaleY: scaleY };
},
/**
* Return the object opacity counting also the group property
* @return {Object} object with scaleX and scaleY properties
*/
getObjectOpacity: function() {
var opacity = this.opacity;
if (this.group) {
opacity *= this.group.getObjectOpacity();
}
return opacity;
},
/**
* @private
* @param {String} key
@ -1258,7 +1270,12 @@
* @param {CanvasRenderingContext2D} ctx Context to render on
*/
_setOpacity: function(ctx) {
ctx.globalAlpha *= this.opacity;
if (this.group && !this.group.transformDone) {
ctx.globalAlpha = this.getObjectOpacity();
}
else {
ctx.globalAlpha *= this.opacity;
}
},
_setStrokeStyles: function(ctx, decl) {