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

10
js/_toolButtons.js
View File

@ -31,7 +31,7 @@ on('click',"eraser-smaller-button", function(e){
}, false);
// rectangle
on('click',"rectangle-button", function(){
on('click','rectangle-button', function(){
// If the user clicks twice on the button, they change the draw mode
if (currentTool.name == 'rectangle') {
if (drawMode == 'empty') {
@ -80,8 +80,8 @@ on('click',"zoom-button", function(){
}, false);
//zoom in button
on('click',"zoom-in-button", function(){
//changeZoom('in',[window.innerWidth/2-canvas.offsetLeft,window.innerHeight/2-canvas.offsetTop]);
on('click','zoom-in-button', function(){
//changeZoom('in',[window.innerWidth/2-canvas.offsetLeft,window.innerHeight/2-canvas.offsetTop]);
changeZoom(layers[0],'in', [canvasSize[0] * zoom / 2, canvasSize[1] * zoom / 2]);
for (let i=1; i<layers.length; i++) {
@ -90,7 +90,7 @@ on('click',"zoom-in-button", function(){
}, false);
//zoom out button
on('click',"zoom-out-button", function(){
on('click','zoom-out-button', function(){
changeZoom(layers[0],'out',[canvasSize[0]*zoom/2,canvasSize[1]*zoom/2]);
for (let i=1; i<layers.length; i++) {
@ -103,4 +103,4 @@ on('click', "rectselect-button", function(){
tool.rectselect.switchTo();
}, false);
/*global on */
/*global on */