From 4bfd66346630d389a5c57ed2d9bd5ace0e8b8d2f Mon Sep 17 00:00:00 2001 From: Hardmath123 Date: Sun, 24 Aug 2014 09:47:47 -0700 Subject: [PATCH 1/3] fix #566 --- .gitignore | 1 + paint.js | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) 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..2e14f389 100644 --- a/paint.js +++ b/paint.js @@ -754,10 +754,11 @@ PaintCanvasMorph.prototype.floodfill = function (sourcepoint) { if (this.settings.primarycolor === "transparent") { data[currentpoint * 4 + 3] = 0; } else { + console.log(this.settings.primarycolor); 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); From f4b372ebc65693420031c77c6d6e68614c7ba22e Mon Sep 17 00:00:00 2001 From: Hardmath123 Date: Sun, 24 Aug 2014 09:48:21 -0700 Subject: [PATCH 2/3] remove log --- paint.js | 1 - 1 file changed, 1 deletion(-) diff --git a/paint.js b/paint.js index 2e14f389..2c155109 100644 --- a/paint.js +++ b/paint.js @@ -754,7 +754,6 @@ PaintCanvasMorph.prototype.floodfill = function (sourcepoint) { if (this.settings.primarycolor === "transparent") { data[currentpoint * 4 + 3] = 0; } else { - console.log(this.settings.primarycolor); data[currentpoint * 4] = this.settings.primarycolor.r; data[currentpoint * 4 + 1] = this.settings.primarycolor.g; data[currentpoint * 4 + 2] = this.settings.primarycolor.b; From 9565290fa7dd14eb68502e7af163edd90bce4f4f Mon Sep 17 00:00:00 2001 From: Hardmath123 Date: Sun, 24 Aug 2014 09:52:23 -0700 Subject: [PATCH 3/3] added history --- paint.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/paint.js b/paint.js index 2c155109..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,