Polished previous bug fix

Now it's possible to use all non-resizable tool and even copy a locked layer to paste it on an unlocked one.
lospec · Dec 12, 2021 · 62130ae · 62130ae
1 parent 1d9ef0f
commit 62130ae
Show file tree

Hide file tree

Showing 6 changed files with 16 additions and 6 deletions.
diff --git a/js/ToolManager.js b/js/ToolManager.js
@@ -59,7 +59,7 @@ const ToolManager = (() => {
                     else if (Input.isAltPressed()) {
                         tools["eyedropper"].onStart(mousePos, mouseEvent.target);
                     }
-                    else if (!currFile.currentLayer.isLocked){
+                    else if (!currFile.currentLayer.isLocked || !((Object.getPrototypeOf(currTool) instanceof DrawingTool))) {
                         currTool.onStart(mousePos, mouseEvent.target);
                     }
                     break;
@@ -91,7 +91,7 @@ const ToolManager = (() => {
                     else if (Input.isAltPressed()) {
                         tools["eyedropper"].onDrag(mousePos, mouseEvent.target);
                     }
-                    else if (!currFile.currentLayer.isLocked){
+                    else if (!currFile.currentLayer.isLocked || !((Object.getPrototypeOf(currTool) instanceof DrawingTool))){
                         currTool.onDrag(mousePos, mouseEvent.target);
                     }
                     break;
@@ -122,7 +122,7 @@ const ToolManager = (() => {
                     else if (Input.isAltPressed()) {
                         tools["eyedropper"].onEnd(mousePos, mouseEvent.target);
                     }
-                    else if (!currFile.currentLayer.isLocked){
+                    else if (!currFile.currentLayer.isLocked || !((Object.getPrototypeOf(currTool) instanceof DrawingTool))) {
                         currTool.onEnd(mousePos);
                     }
                     break;

diff --git a/js/pixel-editor.js b/js/pixel-editor.js
@@ -29,6 +29,7 @@
 //=include layers/PixelGrid.js
 
 /** TOOLS **/
+//=include tools/DrawingTool.js
 //=include tools/ResizableTool.js
 //=include tools/SelectionTool.js
 

diff --git a/js/tools/DrawingTool.js b/js/tools/DrawingTool.js
@@ -0,0 +1,5 @@
+class DrawingTool extends Tool {
+    constructor (name, options) {
+        super(name, options);
+    }
+}
diff --git a/js/tools/FillTool.js b/js/tools/FillTool.js
@@ -1,4 +1,4 @@
-class FillTool extends Tool {
+class FillTool extends DrawingTool {
     constructor(name, options, switchFunction) {
         super(name, options);
 

diff --git a/js/tools/MoveSelectionTool.js b/js/tools/MoveSelectionTool.js
@@ -1,4 +1,4 @@
-class MoveSelectionTool extends Tool {
+class MoveSelectionTool extends DrawingTool {
     currSelection = undefined;
     selectionTool = undefined;
     endTool = undefined;
@@ -25,6 +25,8 @@ class MoveSelectionTool extends Tool {
     }
 
     cutSelection() {
+        if (currFile.currentLayer.isLocked)
+            return;
         this.cutting = true;
         this.lastCopiedSelection = this.currSelection;
         this.endSelection();
@@ -35,6 +37,8 @@ class MoveSelectionTool extends Tool {
     }
 
     pasteSelection() {
+        if (currFile.currentLayer.isLocked)
+            return;
         if (this.lastCopiedSelection === undefined)
             return;
         // Finish the current selection and start a new one with the same data

diff --git a/js/tools/ResizableTool.js b/js/tools/ResizableTool.js
@@ -1,4 +1,4 @@
-class ResizableTool extends Tool {
+class ResizableTool extends DrawingTool {
     startResizePos = undefined;
     currSize = 1;
 	prevSize = 1;