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

Implement consistent checks for fill / stroke / shadow styles in test functions on Style class.

Browse source 
And use them in Item#_setStyles()
This commit is contained in:
Jürg Lehni 2016-02-12 21:22:30 +01:00
parent e38829eb96
commit c6bcf4351a
2 changed files with 20 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
src/item/Item.js
View file

@ -3918,16 +3918,13 @@ new function() { // // Scope to inject various item event handlers
_setStyles: function(ctx) {
// We can access internal properties since we're only using this on
// items without children, where styles would be merged.
var style = this._style,
fillColor = style.getFillColor(),
strokeColor = style.getStrokeColor(),
shadowColor = style.getShadowColor();
if (fillColor)
ctx.fillStyle = fillColor.toCanvasStyle(ctx);
if (strokeColor) {
var style = this._style;
if (style.hasFill())
ctx.fillStyle = style.getFillColor().toCanvasStyle(ctx);
if (style.hasStroke()) {
var strokeWidth = style.getStrokeWidth();
if (strokeWidth > 0) {
ctx.strokeStyle = strokeColor.toCanvasStyle(ctx);
ctx.strokeStyle = style.getStrokeColor().toCanvasStyle(ctx);
ctx.lineWidth = strokeWidth;
var strokeJoin = style.getStrokeJoin(),
strokeCap = style.getStrokeCap(),
@ -3953,17 +3950,12 @@ new function() { // // Scope to inject various item event handlers
}
}
}
if (shadowColor) {
var blur = style.getShadowBlur(),
offset = this.getShadowOffset();
// In order to draw a shadow, we need either a shadow blur or an
// offset, or both.
if (blur > 0 || !offset.isZero()) {
ctx.shadowColor = shadowColor.toCanvasStyle(ctx);
ctx.shadowBlur = blur;
ctx.shadowOffsetX = offset.x;
ctx.shadowOffsetY = offset.y;
}
if (style.hasShadow()) {
var offset = this.getShadowOffset();
ctx.shadowColor = style.getShadowColor().toCanvasStyle(ctx);
ctx.shadowBlur = style.getShadowBlur();
ctx.shadowOffsetX = offset.x;
ctx.shadowOffsetY = offset.y;
}
},

12
src/style/Style.js
View file

@ -283,17 +283,23 @@ var Style = Base.extend(new function() {
// DOCS: Style#hasFill()
hasFill: function() {
return !!this.getFillColor();
var color = this.getFillColor();
return !!color && color.alpha > 0;
},
// DOCS: Style#hasStroke()
hasStroke: function() {
return !!this.getStrokeColor() && this.getStrokeWidth() > 0;
var color = this.getStrokeColor();
return !!color && color.alpha > 0 && this.getStrokeWidth() > 0;
},
// DOCS: Style#hasShadow()
hasShadow: function() {
return !!this.getShadowColor();
var color = this.getShadowColor();
// In order to draw a shadow, we need either a shadow blur or an
// offset, or both.
return !!color && color.alpha > 0 && (this.getShadowBlur() > 0
|| !this.getShadowOffset().isZero());
},
/**