From 27dfde0ad0644831a2ff9bf13e130ba85eb25994 Mon Sep 17 00:00:00 2001 From: Luis Fernando Molina Date: Tue, 10 Mar 2020 17:58:14 +0100 Subject: [PATCH] mac users bug fixed --- Canvas.js | 2 ++ ChartingSpace/Viewport.js | 6 ++---- Globals.js | 3 +++ 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/Canvas.js b/Canvas.js index 94450dd9b..0de5abe37 100644 --- a/Canvas.js +++ b/Canvas.js @@ -834,6 +834,8 @@ function newCanvas () { function onMouseWheel (event) { try { + if (IS_MAC) { event.delta = event.delta / MAC_AMOUNT_FACTOR } + thisObject.mouse.event = event thisObject.mouse.position.x = event.pageX thisObject.mouse.position.y = event.pageY - CURRENT_TOP_MARGIN diff --git a/ChartingSpace/Viewport.js b/ChartingSpace/Viewport.js index 7ec366e40..4a432ac99 100644 --- a/ChartingSpace/Viewport.js +++ b/ChartingSpace/Viewport.js @@ -197,16 +197,14 @@ function newViewport () { } function onMouseWheel (event) { - const MAC_AMOUNT_FACTOR = 5 - if (thisObject.visible === false) { return } if ((event.ctrlKey === true || event.metaKey === true)) { return } let morePower = 1 let amount = event.delta if (event.buttons === 4) { morePower = 2 } // Mouse wheel pressed. /* We adjust the sensitivity for Mac Users */ - let isMac = navigator.platform.toUpperCase().indexOf('MAC') >= 0 - if (isMac) { amount = amount / MAC_AMOUNT_FACTOR } + + if (IS_MAC) { amount = amount / MAC_AMOUNT_FACTOR } if (thisObject.zoomTargetLevel > 10) { amount = amount * 2 diff --git a/Globals.js b/Globals.js index dfddf6b50..b6d1bb722 100644 --- a/Globals.js +++ b/Globals.js @@ -41,6 +41,9 @@ UI_FONT = { SECONDARY: "Source Code Pro" }; +const MAC_AMOUNT_FACTOR = 5 +const IS_MAC = navigator.platform.toUpperCase().indexOf('MAC') >= 0 + const DOUBLE_CLICK_ZOOM_OUT_LEVEL = 0 const DOUBLE_CLICK_ZOOM_IN_LEVEL = 7