diff --git a/.gitignore b/.gitignore index e43b0f98..f31b3e29 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ .DS_Store +*.swp diff --git a/paint.js b/paint.js index 7105b723..3368a64c 100644 --- a/paint.js +++ b/paint.js @@ -49,13 +49,13 @@ May 14 - bugfixes, Snap integration (Jens) May 16 - flat design adjustments (Jens) July 12 - pipette tool, code formatting adjustments (Jens) - September 16 - flood fill freeze fix (Kartik) + Sept 16 - flood fill freeze fix (Kartik) Jan 08 - mouse leave dragging fix (Kartik) Feb 11 - dynamically adjust to stage dimensions (Jens) Apr 30 - localizations (Manuel) June 3 - transformations (Kartik) June 4 - tweaks (Jens) - + Aug 24 - floodfill alpha-integer issue (Kartik) */ /*global Point, Rectangle, DialogBoxMorph, fontHeight, AlignmentMorph, @@ -757,7 +757,7 @@ PaintCanvasMorph.prototype.floodfill = function (sourcepoint) { data[currentpoint * 4] = this.settings.primarycolor.r; data[currentpoint * 4 + 1] = this.settings.primarycolor.g; data[currentpoint * 4 + 2] = this.settings.primarycolor.b; - data[currentpoint * 4 + 3] = this.settings.primarycolor.a; + data[currentpoint * 4 + 3] = this.settings.primarycolor.a*255; } } ctx.putImageData(img, 0, 0);