Atlas48/pointvec
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #16 from cantbesure1/master

Browse Source 
small bugfixes
This commit is contained in:
Лu Лinveгa 2017-11-14 14:35:53 +13:00 committed by GitHub
commit f6d7c47fae
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 27 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
sources/scripts/dotgrid.js
View File

@ -145,12 +145,22 @@ function Dotgrid(width,height,grid_x,grid_y,block_x,block_y,thickness = 3,lineca
if(dotgrid.translation){ dotgrid.translation.to = pos; } if(dotgrid.translation){ dotgrid.translation.to = pos; }
this.cursor.style.left = Math.floor(-(pos.x-this.grid_width)); if(pos.x>0) {
this.cursor.style.top = Math.floor(pos.y+this.grid_height); this.cursor.style.visibility = "hidden"
this.cursor_coord.className = -pos.x > this.width/2 ? "fl left" : "fl" } else {
this.cursor_coord.textContent = parseInt(-pos.x/this.grid_width)+","+parseInt(pos.y/this.grid_height); if(this.cursor.style.visibility == "hidden") {
this.cursor.style.transition = "initial"
}
this.cursor.style.visibility = "visible"
this.cursor.style.left = Math.floor(-(pos.x-this.grid_width));
this.cursor.style.top = Math.floor(pos.y+this.grid_height);
this.cursor_coord.className = -pos.x > this.width/2 ? "fl left" : "fl"
this.cursor_coord.textContent = parseInt(-pos.x/this.grid_width)+","+parseInt(pos.y/this.grid_height);
window.setTimeout(() => dotgrid.cursor.style.transition = "all 50ms", 17 /*one frame*/)
}
dotgrid.guide.update(); dotgrid.guide.update();
} }
this.mouse_up = function(e) this.mouse_up = function(e)
@ -160,15 +170,15 @@ function Dotgrid(width,height,grid_x,grid_y,block_x,block_y,thickness = 3,lineca
if(e.altKey){ return; } if(e.altKey){ return; }
if(dotgrid.translation && !dotgrid.translation.to.is_equal(dotgrid.translation.from)){ if(pos.x>0) { dotgrid.translation = null; return; }
if(dotgrid.translation && !dotgrid.translation.to.is_equal(dotgrid.translation.from) ){
dotgrid.translate(dotgrid.translation); dotgrid.translate(dotgrid.translation);
return; return;
} }
dotgrid.translation = null; dotgrid.translation = null;
if(pos.x>0) return;
if(from === null){ this.set_from(pos.scale(1/this.scale)); } if(from === null){ this.set_from(pos.scale(1/this.scale)); }
else if(to === null){ this.set_to(pos.scale(1/this.scale)); } else if(to === null){ this.set_to(pos.scale(1/this.scale)); }
else{ this.set_end(pos.scale(1/this.scale)); } else{ this.set_end(pos.scale(1/this.scale)); }

18
sources/scripts/guide.js
View File

@ -90,13 +90,15 @@ function Guide()
var from = dotgrid.translation.from; var from = dotgrid.translation.from;
var to = dotgrid.translation.to; var to = dotgrid.translation.to;
ctx.beginPath(); if(to.x<=0) {
ctx.moveTo((from.x * -2)+20,(from.y * 2)+20); ctx.beginPath();
ctx.lineTo((to.x * -2)+20,(to.y * 2)+20); ctx.moveTo((from.x * -2)+20,(from.y * 2)+20);
ctx.lineCap="round"; ctx.lineTo((to.x * -2)+20,(to.y * 2)+20);
ctx.lineWidth = 5; ctx.lineCap="round";
ctx.strokeStyle = dotgrid.theme.active.f_high; ctx.lineWidth = 5;
ctx.stroke(); ctx.strokeStyle = dotgrid.theme.active.f_high;
ctx.closePath(); ctx.stroke();
ctx.closePath();
}
} }
} }