fix mouse clicks in wrong position in color selection or outliner when zoomed in or out
This commit is contained in:
parent
f34a518602
commit
0715abdf74
|
|
@ -1778,13 +1778,14 @@ function getMousePos(canvas, evt, skipOffsets = false, skipZoom = false) {
|
||||||
var rect = canvas.getBoundingClientRect();
|
var rect = canvas.getBoundingClientRect();
|
||||||
let offsetX = canvas.offsetX || 0;
|
let offsetX = canvas.offsetX || 0;
|
||||||
let offsetY = canvas.offsetY || 0;
|
let offsetY = canvas.offsetY || 0;
|
||||||
|
let zoomLevel = canvas.zoomLevel || 1;
|
||||||
if (skipOffsets) {
|
if (skipOffsets) {
|
||||||
offsetX = 0;
|
offsetX = 0;
|
||||||
offsetY = 0;
|
offsetY = 0;
|
||||||
}
|
}
|
||||||
return {
|
return {
|
||||||
x: (evt.clientX + offsetX - rect.left) / (skipZoom ? 1 : context.zoomLevel),
|
x: (evt.clientX + offsetX - rect.left) / (skipZoom ? 1 : zoomLevel),
|
||||||
y: (evt.clientY + offsetY - rect.top) / (skipZoom ? 1 : context.zoomLevel),
|
y: (evt.clientY + offsetY - rect.top) / (skipZoom ? 1 : zoomLevel),
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -4297,6 +4298,7 @@ function updateScrollPosition(zoomFactor) {
|
||||||
(canvas.offsetX + context.mousePos.x) * zoomFactor - context.mousePos.x;
|
(canvas.offsetX + context.mousePos.x) * zoomFactor - context.mousePos.x;
|
||||||
canvas.offsetY =
|
canvas.offsetY =
|
||||||
(canvas.offsetY + context.mousePos.y) * zoomFactor - context.mousePos.y;
|
(canvas.offsetY + context.mousePos.y) * zoomFactor - context.mousePos.y;
|
||||||
|
canvas.zoomLevel = context.zoomLevel
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
@ -4337,6 +4339,7 @@ function stage() {
|
||||||
// stage.height = config.fileHeight
|
// stage.height = config.fileHeight
|
||||||
stage.offsetX = 0;
|
stage.offsetX = 0;
|
||||||
stage.offsetY = 0;
|
stage.offsetY = 0;
|
||||||
|
stage.zoomLevel = context.zoomLevel
|
||||||
|
|
||||||
let lastResizeTime = 0;
|
let lastResizeTime = 0;
|
||||||
const throttleIntervalMs = 20;
|
const throttleIntervalMs = 20;
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue