Commit 0c12aa3e authored by rockyl's avatar rockyl

Merge branch 'master' into mvvm

# Conflicts:
#	manifest.json
#	src/2d/display/Stage.ts
parents eedc3d22 ff29b190
{"id":"engine","url":"engine.210e93fc8ecfcb27da00c77582649b96949d28c3.js"}
\ No newline at end of file
{"id":"engine","url":"engine.47eb390007c368d3dc5648734153301ebead724b.js"}
\ No newline at end of file
......@@ -646,7 +646,6 @@ export class Stage extends Container {
let rootDiv = s.rootDiv;
let doc = document.documentElement;
let box = rootDiv.getBoundingClientRect();//points[o].target
console.log(box.y);
let left = box.left + window.pageXOffset - doc.clientLeft;
let top = box.top + window.pageYOffset - doc.clientTop;
cp.x = (points[o].pageX - left) * devicePixelRatio;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment