mirror/piskel
1
0
Fork 0
mirror of https://github.com/piskelapp/piskel.git synced 2023-08-10 21:12:52 +03:00
Code Issues Projects Releases Wiki Activity

Merge pull request #326 from AlexHolly/touch_s-pen

Browse Source 
Tablet Touch & s-pen
This commit is contained in:
Julian Descottes 2015-11-07 14:01:09 +01:00
commit 6311049210
1 changed files with 16 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/js/controller/DrawingController.js
View File

@ -85,7 +85,9 @@
window.addEventListener('mouseup', this.onMouseup_.bind(this)); window.addEventListener('mouseup', this.onMouseup_.bind(this));
window.addEventListener('mousemove', this.onMousemove_.bind(this)); window.addEventListener('mousemove', this.onMousemove_.bind(this));
window.addEventListener('keyup', this.onKeyup_.bind(this)); window.addEventListener('keyup', this.onKeyup_.bind(this));
window.addEventListener('touchstart', this.onMousedown_.bind(this));
window.addEventListener('touchmove' , this.onMousemove_.bind(this));
window.addEventListener('touchend', this.onMouseup_.bind(this));
// Deactivate right click: // Deactivate right click:
body.contextmenu(this.onCanvasContextMenu_); body.contextmenu(this.onCanvasContextMenu_);
@ -140,6 +142,10 @@
$.publish(Events.MOUSE_EVENT, [event, this]); $.publish(Events.MOUSE_EVENT, [event, this]);
var frame = this.piskelController.getCurrentFrame(); var frame = this.piskelController.getCurrentFrame();
var coords = this.getSpriteCoordinates(event.clientX, event.clientY); var coords = this.getSpriteCoordinates(event.clientX, event.clientY);
if (typeof event.changedTouches != 'undefined' &&
typeof event.changedTouches[0] != 'undefined') {
coords = this.getSpriteCoordinates(event.changedTouches[0].clientX, event.changedTouches[0].clientY);
}
this.isClicked = true; this.isClicked = true;
@ -164,6 +170,11 @@
ns.DrawingController.prototype.onMousemove_ = function (event) { ns.DrawingController.prototype.onMousemove_ = function (event) {
this._clientX = event.clientX; this._clientX = event.clientX;
this._clientY = event.clientY; this._clientY = event.clientY;
if (typeof event.changedTouches != 'undefined' &&
typeof event.changedTouches[0] != 'undefined') {
this._clientX = event.changedTouches[0].clientX;
this._clientY = event.changedTouches[0].clientY;
}
var currentTime = new Date().getTime(); var currentTime = new Date().getTime();
// Throttling of the mousemove event: // Throttling of the mousemove event:
@ -252,6 +263,10 @@
ns.DrawingController.prototype.onMouseup_ = function (event) { ns.DrawingController.prototype.onMouseup_ = function (event) {
var frame = this.piskelController.getCurrentFrame(); var frame = this.piskelController.getCurrentFrame();
var coords = this.getSpriteCoordinates(event.clientX, event.clientY); var coords = this.getSpriteCoordinates(event.clientX, event.clientY);
if (typeof event.changedTouches != 'undefined' &&
typeof event.changedTouches[0] != 'undefined') {
coords = this.getSpriteCoordinates(event.changedTouches[0].clientX, event.changedTouches[0].clientY);
}
if (this.isClicked) { if (this.isClicked) {
// A mouse button was clicked on the drawing canvas before this mouseup event, // A mouse button was clicked on the drawing canvas before this mouseup event,
// the user was probably drawing on the canvas. // the user was probably drawing on the canvas.