diff --git a/js/_copyPaste.js b/js/_copyPaste.js index b3b27aa..90e2a70 100644 --- a/js/_copyPaste.js +++ b/js/_copyPaste.js @@ -6,9 +6,6 @@ let copiedStartY; let copiedEndX; let copiedEndY; -// BUG: when merging tmp layer to currentLayer there are offset problems -// FIX: maybe copy the entire tmp layer and paste it so that the merging happens at 0,0 - function copySelection() { copiedEndX = endX; copiedEndY = endY; @@ -65,9 +62,4 @@ function cutSelectionTool() { clipboardData = currentLayer.context.getImageData(startX, startY, endX - startX + 1, endY - startY + 1); currentLayer.context.clearRect(startX - 0.5, startY - 0.5, endX - startX + 1, endY - startY + 1); } - - // Moving those pixels from the current layer to the tmp layer - //TMPLayer.context.putImageData(imageDataToMove, startX + 1, startY); - - //originalDataPosition = [currentPos[0], currentPos[1]]; } \ No newline at end of file diff --git a/js/_getCursorPosition.js b/js/_getCursorPosition.js index 3c28662..d4addcc 100644 --- a/js/_getCursorPosition.js +++ b/js/_getCursorPosition.js @@ -6,6 +6,8 @@ function getCursorPosition(e) { if (e.pageX != undefined && e.pageY != undefined) { x = e.pageX; y = e.pageY; + + console.log("passato di qui"); } else { x = e.clientX + document.body.scrollLeft + document.documentElement.scrollLeft; @@ -15,5 +17,5 @@ function getCursorPosition(e) { x -= canvas.offsetLeft; y -= canvas.offsetTop; - return [x,y]; + return [Math.round(x), Math.round(y)]; } \ No newline at end of file diff --git a/js/_rectangle.js b/js/_rectangle.js index 63fc6b0..516f730 100644 --- a/js/_rectangle.js +++ b/js/_rectangle.js @@ -53,8 +53,6 @@ function endRectDrawing(mouseEvent) { startRectY = tmp; } - let hexColor = hexToRgb(currentLayer.context.fillStyle); - // Resetting this isDrawingRect = false; // Drawing the rect diff --git a/js/_tools.js b/js/_tools.js index 25bb839..335c09a 100644 --- a/js/_tools.js +++ b/js/_tools.js @@ -95,8 +95,8 @@ class Tool { } moveBrushPreview(cursorLocation) { - brushPreview.style.left = cursorLocation[0] + currentLayer.canvas.offsetLeft - this.currentBrushSize * zoom / 2 + 'px'; - brushPreview.style.top = cursorLocation[1] + currentLayer.canvas.offsetTop - this.currentBrushSize * zoom / 2 + 'px'; + brushPreview.style.left = (Math.ceil(cursorLocation[0] / zoom) * zoom + currentLayer.canvas.offsetLeft - this.currentBrushSize * zoom / 2 - zoom / 2) + 'px'; + brushPreview.style.top = (Math.ceil(cursorLocation[1] / zoom) * zoom + currentLayer.canvas.offsetTop - this.currentBrushSize * zoom / 2 - zoom / 2) + 'px'; } }