From ac2256d2c541fb465f959131f6a216574be7f70b Mon Sep 17 00:00:00 2001 From: Casper Lamboo Date: Wed, 9 May 2018 13:22:23 +0200 Subject: [PATCH] fix position of pointer in brush tool and eraser pointer --- src/d2/EraserPointer.js | 3 ++- src/d2/tools/BrushTool.js | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/d2/EraserPointer.js b/src/d2/EraserPointer.js index 57a1fd8..5a8176d 100644 --- a/src/d2/EraserPointer.js +++ b/src/d2/EraserPointer.js @@ -1,6 +1,7 @@ import { Vector } from 'cal'; import transposeEvents from '../utils/transposeEvents.js'; import { PIXEL_RATIO } from '../constants/general.js'; +import { convertEvent } from '../utils/pointerUtils.js'; // import createDebug from 'debug'; // const debug = createDebug('d3d:design:EraserPointer'); @@ -28,7 +29,7 @@ export default class EraserPointer { pointerMove(event) { this.showMouse = event.pointerType === 'mouse'; if (this.erasing || this.showMouse) { - this.mousePosition.set(event.clientX, event.clientY); + this.mousePosition.copy(convertEvent(event.target, event)); if (this.onChanged) this.onChanged(); } } diff --git a/src/d2/tools/BrushTool.js b/src/d2/tools/BrushTool.js index 9cbfe72..6473dfd 100644 --- a/src/d2/tools/BrushTool.js +++ b/src/d2/tools/BrushTool.js @@ -1,6 +1,7 @@ import BaseTool from './BaseTool.js'; import { Vector } from 'cal'; import { PIXEL_RATIO } from '../../constants/general.js'; +import { convertEvent } from '../../utils/pointerUtils.js'; // import createDebug from 'debug'; // const debug = createDebug('d3d:2d:tool:eraser'); export default class BrushTool extends BaseTool { @@ -14,7 +15,7 @@ export default class BrushTool extends BaseTool { pointerMove(event) { this.showMouse = event.pointerType === 'mouse'; if (this.showMouse) { - this.mousePosition.set(event.clientX, event.clientY); + this.mousePosition.copy(convertEvent(event.target, event)); this.renderRequest(); } }