From 4bfd66346630d389a5c57ed2d9bd5ace0e8b8d2f Mon Sep 17 00:00:00 2001 From: Hardmath123 Date: Sun, 24 Aug 2014 09:47:47 -0700 Subject: fix #566 --- paint.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'paint.js') diff --git a/paint.js b/paint.js index 7105b72..2e14f38 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); -- cgit v1.3.1 From f4b372ebc65693420031c77c6d6e68614c7ba22e Mon Sep 17 00:00:00 2001 From: Hardmath123 Date: Sun, 24 Aug 2014 09:48:21 -0700 Subject: remove log --- paint.js | 1 - 1 file changed, 1 deletion(-) (limited to 'paint.js') diff --git a/paint.js b/paint.js index 2e14f38..2c15510 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; -- cgit v1.3.1 From 9565290fa7dd14eb68502e7af163edd90bce4f4f Mon Sep 17 00:00:00 2001 From: Hardmath123 Date: Sun, 24 Aug 2014 09:52:23 -0700 Subject: added history --- paint.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'paint.js') diff --git a/paint.js b/paint.js index 2c15510..3368a64 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, -- cgit v1.3.1 From d9e06c011c767cfe0c36a5d29387afcd64ccb0be Mon Sep 17 00:00:00 2001 From: jmoenig Date: Mon, 29 Sep 2014 10:15:08 +0200 Subject: Paint: flood fill issue fixed, thanks, Kartik! --- history.txt | 1 + paint.js | 5 +++-- 2 files changed, 4 insertions(+), 2 deletions(-) (limited to 'paint.js') diff --git a/history.txt b/history.txt index 3194cfd..ec1b9cb 100755 --- a/history.txt +++ b/history.txt @@ -2281,3 +2281,4 @@ ______ * Threads: fixed #591 fully copy local variables for sprite duplicates and (Scratch-like) clones * Portuguese translation update, thanks, Manuel! * fixed #590 (Russian translation syntax glitches) Thanks @alexf2000 ! +* Paint: flood fill issue fixed, thanks, Kartik! diff --git a/paint.js b/paint.js index 3368a64..65ae1f6 100644 --- a/paint.js +++ b/paint.js @@ -56,6 +56,7 @@ June 3 - transformations (Kartik) June 4 - tweaks (Jens) Aug 24 - floodfill alpha-integer issue (Kartik) + Sep 29 - tweaks (Jens) */ /*global Point, Rectangle, DialogBoxMorph, fontHeight, AlignmentMorph, @@ -68,7 +69,7 @@ // Global stuff //////////////////////////////////////////////////////// -modules.paint = '2014-June-4'; +modules.paint = '2014-September-29'; // Declarations @@ -757,7 +758,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*255; + data[currentpoint * 4 + 3] = this.settings.primarycolor.a * 255; } } ctx.putImageData(img, 0, 0); -- cgit v1.3.1