mirror/pixel-editor
1
0
Fork 0
mirror of https://github.com/lospec/pixel-editor.git synced 2023-08-10 21:12:51 +03:00
Code Issues Projects Releases Wiki Activity

Merge branch 'master' into next-update

Browse Source
This commit is contained in:
Nicola 2022-01-08 17:10:30 +01:00
commit ac18dff161
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
js/ToolManager.js
View File

@ -8,7 +8,7 @@ const ToolManager = (() => {
tools["line"] = new LineTool("line", {type: 'html'}, switchTool); tools["line"] = new LineTool("line", {type: 'html'}, switchTool);
tools["fill"] = new FillTool("fill", {type: 'cursor', style: 'crosshair'}, switchTool); tools["fill"] = new FillTool("fill", {type: 'cursor', style: 'crosshair'}, switchTool);
tools["eyedropper"] = new EyedropperTool("eyedropper", {type: 'cursor', style: 'crosshair'}, switchTool); tools["eyedropper"] = new EyeDropperTool("eyedropper", {type: 'cursor', style: 'crosshair'}, switchTool);
tools["pan"] = new PanTool("pan", {type: 'custom'}, switchTool); tools["pan"] = new PanTool("pan", {type: 'custom'}, switchTool);
tools["zoom"] = new ZoomTool("zoom", {type:'custom'}); tools["zoom"] = new ZoomTool("zoom", {type:'custom'});

2
js/pixel-editor.js
View File

@ -38,7 +38,7 @@
//=include tools/LineTool.js //=include tools/LineTool.js
//=include tools/RectangleTool.js //=include tools/RectangleTool.js
//=include tools/FillTool.js //=include tools/FillTool.js
//=include tools/EyedropperTool.js //=include tools/EyeDropperTool.js
//=include tools/PanTool.js //=include tools/PanTool.js
//=include tools/ZoomTool.js //=include tools/ZoomTool.js
//=include tools/RectangularSelectionTool.js //=include tools/RectangularSelectionTool.js

2
js/tools/EyeDropperTool.js
View File

@ -1,4 +1,4 @@
class EyedropperTool extends Tool { class EyeDropperTool extends Tool {
eyedropperPreview = document.getElementById("eyedropper-preview"); eyedropperPreview = document.getElementById("eyedropper-preview");
selectedColor = {r:0, g:0, b:0}; selectedColor = {r:0, g:0, b:0};