diff --git a/zoompinch-vue/package.json b/zoompinch-vue/package.json index 725b6a6..7813f58 100644 --- a/zoompinch-vue/package.json +++ b/zoompinch-vue/package.json @@ -1,7 +1,7 @@ { "name": "zoompinch", "private": false, - "version": "0.0.32", + "version": "0.0.33", "type": "module", "files": [ "package.json", diff --git a/zoompinch-vue/src/controllers/wheel.ts b/zoompinch-vue/src/controllers/wheel.ts index 92ab955..ac26d7b 100644 --- a/zoompinch-vue/src/controllers/wheel.ts +++ b/zoompinch-vue/src/controllers/wheel.ts @@ -46,13 +46,13 @@ export function useWheel({ let { deltaX, deltaY, ctrlKey } = event; const mouseMultiples = [120, 100]; const mouseFactor = 4; - if (Math.abs(deltaX)) { - } - if (isMultipleOf(deltaX, mouseMultiples)) { - deltaX = (deltaX / ((100 / mouseFactor) * isMultipleOf(deltaX, mouseMultiples))) * Math.sign(deltaX); - } - if (isMultipleOf(deltaY, mouseMultiples)) { - deltaY = (deltaY / ((100 / mouseFactor) * isMultipleOf(deltaY, mouseMultiples))) * Math.sign(deltaY); + if (!detectTrackpad(event)) { + if (Math.abs(deltaX) === 120 || Math.abs(deltaX) === 200) { + deltaX = (deltaX / ((100 / mouseFactor) * isMultipleOf(deltaX, mouseMultiples))) * Math.sign(deltaX); + } + if (Math.abs(deltaY) === 120 || Math.abs(deltaY) === 200) { + deltaY = (deltaY / ((100 / mouseFactor) * isMultipleOf(deltaY, mouseMultiples))) * Math.sign(deltaY); + } } const currScale = scale.value; if (ctrlKey) {