Added eraser icon, added management of eraser size, added event listener for R key (connected to the eraser tool). Started eraser cursor management in _updateCursors.js

Signed-off-by: npalomba <nicola.palomba@studenti.galileilivorno.gov.it>

js/_hotkeyListener.js

@@ -33,6 +33,10 @@ function KeyPress(e) {
 		case 53:
 		  changeTool('zoom');
 		  break;
+		 // eraser -6, r
+	     case 54: case 72:
+	     	changeTool('eraser');
+	     	break;
 		//Z
 		case 90:
 		  console.log('PRESSED Z ', keyboardEvent.ctrlKey)

js/_toolButtons.js

@@ -1,19 +1,36 @@
 //pencil
 on('click',"pencil-button", function(){
-	changeTool('pencil');
-}, false);		
+    changeTool('pencil');
+}, false);
 
 //pencil bigger
 on('click',"pencil-bigger-button", function(){
-	brushSize++;
-	updateCursor();
-}, false);		
+    brushSize++;
+    updateCursor();
+}, false);
 
 //pencil smaller
-on('click',"pencil-smaller-button", function(e){
-	if(brushSize > 1) brushSize--;
-	updateCursor();
-}, false);		
+on('click',"pencil-smaller-button", function(){
+    if(brushSize > 1) brushSize--;
+    updateCursor();
+}, false);
+
+//eraser
+on('click',"eraser-button", function(){
+    changeTool('eraser');
+}, false);
+
+//eraser bigger
+on('click',"eraser-bigger-button", function(){
+    eraserSize++;
+    updateCursor();
+}, false);
+
+//eraser smaller
+on('click',"eraser-smaller-button", function(e){
+    if(eraserSize > 1) eraserSize--;
+    updateCursor();
+}, false);
 
 //fill
 on('click',"fill-button", function(){

js/_updateCursor.js

@@ -6,7 +6,13 @@ function updateCursor () {
 		brushPreview.style.display = 'block';
 		brushPreview.style.width = brushSize * zoom + 'px';
 		brushPreview.style.height = brushSize * zoom + 'px';
-	} else 
+	} else if (currentTool == 'eraser') {
+		console.log("Eraser size: " + eraserSize);
+        canvasView.style.cursor = 'crosshair';
+        brushPreview.style.display = 'block';
+        brushPreview.style.width = eraserSize * zoom + 'px';
+        brushPreview.style.height = eraserSize * zoom + 'px';
+	} else
 		brushPreview.style.display = 'none';
 	
 	if (currentTool == 'eyedropper') {
@@ -28,5 +34,4 @@ function updateCursor () {
 		
 	if (currentTool == 'resize-brush') 
 		canvasView.style.cursor = 'default';
-
 }

js/_variables.js

@@ -6,7 +6,9 @@ var canvasPosition;
 var currentTool = 'pencil';
 var currentToolTemp = 'pencil';
 var brushSize = 1;
+var eraserSize = 1;
 var prevBrushSize = 1;
+var prevEraserSize = 1;
 var menuOpen = false;
 var dialogueOpen = false;
 var documentCreated = false;