Skip to content

Commit

Permalink
Merge branch 'transparent-pen'
Browse files Browse the repository at this point in the history
  • Loading branch information
nathan committed May 22, 2015
2 parents fe173d3 + d272575 commit 5e9a44f
Showing 1 changed file with 3 additions and 1 deletion.
4 changes: 3 additions & 1 deletion phosphorus.js
Original file line number Diff line number Diff line change
Expand Up @@ -1337,6 +1337,8 @@ var P = (function() {
c.scratchX = this.scratchX;
c.scratchY = this.scratchY;
c.visible = this.visible;
c.penColor = this.penColor;
c.penCSS = this.penCSS;
c.penHue = this.penHue;
c.penSaturation = this.penSaturation;
c.penLightness = this.penLightness;
Expand Down Expand Up @@ -1396,8 +1398,8 @@ var P = (function() {
var context = this.stage.penContext;
var x = this.scratchX;
var y = this.scratchY;
context.beginPath();
context.fillStyle = this.penCSS || 'hsl(' + this.penHue + ',' + this.penSaturation + '%,' + (this.penLightness > 100 ? 200 - this.penLightness : this.penLightness) + '%)';
context.beginPath();
context.arc(240 + x, 180 - y, this.penSize / 2, 0, 2 * Math.PI, false);
context.fill();
};
Expand Down

0 comments on commit 5e9a44f

Please sign in to comment.