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

fixed merge

Browse Source
This commit is contained in:
Sam Keddy
2020-04-15 00:10:21 +00:00
parent 91da252f49 6dc80f61bf
commit f3ce09ac5a
45 changed files with 5409 additions and 4199 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
js/_rectangle.js
View File

@@ -12,17 +12,17 @@ let endRectY;
function startRectDrawing(mouseEvent) {
// Putting the vfx layer on top of everything
VFXCanvas.style.zIndex = MAX_Z_INDEX;
// Updating flag
isDrawingRect = true;
// Putting the vfx layer on top of everything
VFXCanvas.style.zIndex = MAX_Z_INDEX;
// Updating flag
isDrawingRect = true;
// Saving the start coords of the rect
let cursorPos = getCursorPosition(mouseEvent);
startRectX = Math.round(cursorPos[0] / zoom) - 0.5;
startRectY = Math.round(cursorPos[1] / zoom) - 0.5;
// Saving the start coords of the rect
let cursorPos = getCursorPosition(mouseEvent);
startRectX = Math.floor(cursorPos[0] / zoom) + 0.5;
startRectY = Math.floor(cursorPos[1] / zoom) + 0.5;
drawRectangle(startRectX, startRectY);
drawRectangle(startRectX, startRectY);
}
function updateRectDrawing(mouseEvent) {
@@ -101,20 +101,20 @@ function drawRectangle(x, y) {
vfxContext.setLineDash([]);
vfxContext.stroke();
vfxContext.stroke();
}
function setRectToolSvg() {
if (drawMode == 'empty') {
emptySVG.setAttribute("display", "visible");
fullSVG.setAttribute("display", "none");
}
else {
emptySVG.setAttribute("display", "none");
fullSVG.setAttribute("display", "visible");
}
if (drawMode == 'empty') {
emptySVG.setAttribute('display', 'visible');
fullSVG.setAttribute('display', 'none');
}
else {
emptySVG.setAttribute('display', 'none');
fullSVG.setAttribute('display', 'visible');
}
}
function applyChanges() {
VFXCanvas.style.zIndex = MIN_Z_INDEX;
}
VFXCanvas.style.zIndex = MIN_Z_INDEX;
}