pinmenote.com/pinmenote-extension
1
0
Fork 0
Code Issues 1 Pull Requests 1 Actions Projects Releases Wiki Activity

fix: firefox fill - show bug information

Browse Source
This commit is contained in:
Michal Szczepanski 2023-10-17 02:31:39 +02:00
parent 182179dfb0
commit 7911b6deda
2 changed files with 19 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/common/components/pin/draw/draw-area.component.ts
View File

@ -15,6 +15,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
import { DrawToolDto, ObjDrawDataDto } from '../../../model/obj/obj-draw.dto';
import { BrowserApi } from '@pinmenote/browser-api';
import { DrawDataModel } from '../model/pin-draw-edit.model';
import { EraserDraw } from './tool/eraser.draw';
import { FillDraw } from './tool/fill.draw';
@ -23,6 +24,7 @@ import { ObjPointDto } from '../../../model/obj/obj-utils.dto';
import { PencilDraw } from './tool/pencil.draw';
import { PinEditModel } from '../model/pin-edit.model';
import { applyStylesToElement } from '../../../style.utils';
import { fnConsoleLog } from '../../../fn/fn-console';
const canvasStyles = {
position: 'absolute',
@ -188,8 +190,22 @@ no javascript enabled - drawing not working</h1>`;
EraserDraw.raster(points, this.model.draw.size, this.rasterCtx);
break;
case DrawToolDto.Fill:
points = FillDraw.fill({ x: e.offsetX, y: e.offsetY }, this.model.draw.color, this.drawCtx);
FillDraw.raster(points, this.model.draw.color, this.rasterCtx);
try {
points = FillDraw.fill({ x: e.offsetX, y: e.offsetY }, this.model.draw.color, this.drawCtx);
FillDraw.raster(points, this.model.draw.color, this.rasterCtx);
} catch (e) {
fnConsoleLog('drawOne->error', e);
if (
!BrowserApi.isChrome &&
e instanceof DOMException &&
e.message.startsWith('CanvasRenderingContext2D.putImageData')
) {
alert(
'Firefox problem - see details under this bug url https://bugzilla.mozilla.org/show_bug.cgi?id=1853273'
);
return;
}
}
break;
}
// clear draw canvas

2
src/common/components/pin/draw/tool/fill.draw.ts
View File

@ -66,7 +66,7 @@ export class FillDraw {
stack.push({ x: point.x, y: point.y - 1 });
}
}
const imData = new ImageData(new Uint8ClampedArray(pixelData), width, height);
const imData = new ImageData(pixelData, width, height);
ctx.putImageData(imData, 0, 0);
return [from];