gitea-mirror/aladin-lite
1
0
Fork 0
mirror of https://github.com/cds-astro/aladin-lite.git synced 2026-01-04 09:07:59 -08:00
Code Issues Packages Projects Releases Wiki Activity

fix touch events

Browse Source
This commit is contained in:
Matthieu BAUMANN
2022-10-26 13:06:57 +02:00
parent 5c14530f54
commit e0d9826eef
2 changed files with 8 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/js/Utils.js
View File

@@ -48,7 +48,7 @@ function relMouseCoords(event) {
var currentElement = this;
if (event.offsetX) {
return {x: event.offsetX, y:event.offsetY};
return {x: event.offsetX, y: event.offsetY};
}
else {
if (!Utils.cssScale) {
@@ -81,6 +81,7 @@ function relMouseCoords(event) {
if (e.originalEvent.changedTouches) {
clientX = e.originalEvent.changedTouches[0].clientX;
clientY = e.originalEvent.changedTouches[0].clientY;
}
var offsetX = clientX - borderLeftWidth - rect.left;

66
src/js/View.js
View File

@@ -483,19 +483,8 @@ export let View = (function () {
return;
}
var xymouse = view.imageCanvas.relMouseCoords(e);
if (e.originalEvent && e.originalEvent.targetTouches) {
view.dragx = e.originalEvent.targetTouches[0].clientX;
view.dragy = e.originalEvent.targetTouches[0].clientY;
}
else {
/*
view.dragx = e.clientX;
view.dragy = e.clientY;
*/
view.dragx = xymouse.x;
view.dragy = xymouse.y;
}
view.dragx = xymouse.x;
view.dragy = xymouse.y;
view.dragging = true;
if (view.mode == View.PAN) {
@@ -763,59 +752,16 @@ export let View = (function () {
}
//var xoffset, yoffset;
var s1, s2;
if (e.originalEvent && e.originalEvent.targetTouches) {
/*xoffset = e.originalEvent.targetTouches[0].clientX-view.dragx;
yoffset = e.originalEvent.targetTouches[0].clientY-view.dragy;
var xy1 = AladinUtils.viewToXy(e.originalEvent.targetTouches[0].clientX, e.originalEvent.targetTouches[0].clientY, view.width, view.height, view.largestDim, view.zoomFactor);
var xy2 = AladinUtils.viewToXy(view.dragx, view.dragy, view.width, view.height, view.largestDim, view.zoomFactor);
pos1 = view.projection.unproject(xy1.x, xy1.y);
pos2 = view.projection.unproject(xy2.x, xy2.y);*/
s1 = { x: view.dragx, y: view.dragy };
s2 = { x: e.originalEvent.targetTouches[0].clientX, y: e.originalEvent.targetTouches[0].clientY };
}
else {
/*
xoffset = e.clientX-view.dragx;
yoffset = e.clientY-view.dragy;
xoffset = xymouse.x-view.dragx;
yoffset = xymouse.y-view.dragy;
var xy1 = AladinUtils.viewToXy(xymouse.x, xymouse.y, view.width, view.height, view.largestDim, view.zoomFactor);
var xy2 = AladinUtils.viewToXy(view.dragx, view.dragy, view.width, view.height, view.largestDim, view.zoomFactor);
*/
//pos1 = view.projection.unproject(xy1.x, xy1.y);
//pos2 = view.projection.unproject(xy2.x, xy2.y);
/*pos1 = webglAPI.screenToWorld(view.dragx, view.dragy);
pos2 = webglAPI.screenToWorld(xymouse.x, xymouse.y);
if (pos2 == undefined) {
return;
}*/
s1 = { x: view.dragx, y: view.dragy };
s2 = { x: xymouse.x, y: xymouse.y };
}
s1 = { x: view.dragx, y: view.dragy };
s2 = { x: xymouse.x, y: xymouse.y };
// TODO : faut il faire ce test ??
// var distSquared = xoffset*xoffset+yoffset*yoffset;
// if (distSquared<3) {
// return;
// }
if (e.originalEvent && e.originalEvent.targetTouches) {
view.dragx = e.originalEvent.targetTouches[0].clientX;
view.dragy = e.originalEvent.targetTouches[0].clientY;
}
else {
view.dragx = xymouse.x;
view.dragy = xymouse.y;
/*
view.dragx = e.clientX;
view.dragy = e.clientY;
*/
}
view.dragx = xymouse.x;
view.dragy = xymouse.y;
if (view.mode == View.SELECT) {
view.requestRedraw();