From 2494946d950a662bcc07850ce951b4e3c05ebd72 Mon Sep 17 00:00:00 2001 From: Devine Lu Linvega Date: Mon, 19 Dec 2016 15:05:49 -0700 Subject: [PATCH] Fixed drag mode. --- scripts/core/ronin.js | 5 +++++ scripts/modes/mode.drag.js | 6 +++--- scripts/modes/mode.guide.js | 2 +- 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/scripts/core/ronin.js b/scripts/core/ronin.js index 893428f..c5dddbb 100644 --- a/scripts/core/ronin.js +++ b/scripts/core/ronin.js @@ -36,4 +36,9 @@ function Ronin() { return new Position(e.clientX - parseFloat(ronin.surface.style.left) - parseFloat(ronin.canvas.element.style.left),e.clientY- parseFloat(ronin.surface.style.top) - parseFloat(ronin.canvas.element.style.top)); } + + this.position_in_window = function(p) + { + return new Position(p.x + parseFloat(ronin.surface.style.left) + parseFloat(ronin.canvas.element.style.left),p.y + parseFloat(ronin.surface.style.top) + parseFloat(ronin.canvas.element.style.top)); + } } \ No newline at end of file diff --git a/scripts/modes/mode.drag.js b/scripts/modes/mode.drag.js index 1ad5b1b..581eeaa 100644 --- a/scripts/modes/mode.drag.js +++ b/scripts/modes/mode.drag.js @@ -8,15 +8,15 @@ function Mode_Drag() this.mouse_down = function(position) { - this.drag_from = position; + this.drag_from = ronin.position_in_window(position); } this.mouse_move = function(position) { - console.log(position); - return; if(this.drag_from === null){ return; } + position = ronin.position_in_window(position); + var offset_x = this.drag_from.x - position.x; var offset_y = this.drag_from.y - position.y; diff --git a/scripts/modes/mode.guide.js b/scripts/modes/mode.guide.js index 8d6bd01..524a70d 100644 --- a/scripts/modes/mode.guide.js +++ b/scripts/modes/mode.guide.js @@ -18,7 +18,7 @@ function Mode_Guide() this.mouse_move = function(position) { - if(this.live_draw_from == null){ return; } + if(this.live_draw_from === null){ return; } ronin.overlay.clear();