From d299cbd482949c1528e34b3ccf89784c0d1c14b2 Mon Sep 17 00:00:00 2001
From: Luis Fernando Molina <Luis-Fernando-Molina@users.noreply.github.com>
Date: Tue, 10 Mar 2020 19:08:45 +0100
Subject: [PATCH] IS MAC

---
 CanvasApp/Canvas.js                       |  4 ++-
 CanvasApp/FloatingSpace/FloatingObject.js | 10 ++++++-
 CanvasApp/FloatingSpace/UiObject.js       |  2 +-
 CanvasApp/Scales/TimeFrameScale.js        | 35 +++++++++++++++++++++++
 4 files changed, 48 insertions(+), 3 deletions(-)

diff --git a/CanvasApp/Canvas.js b/CanvasApp/Canvas.js
index 83f2cc52a..c4e8eb2b6 100644
--- a/CanvasApp/Canvas.js
+++ b/CanvasApp/Canvas.js
@@ -842,7 +842,9 @@ function newCanvas () {
            // cross-browser wheel delta
       var event = window.event || event // old IE support
       event.delta = Math.max(-1, Math.min(1, event.wheelDelta || -event.detail))
-      if (IS_MAC) { event.delta = event.delta / MAC_AMOUNT_FACTOR }
+      if (IS_MAC) {
+        event.delta = event.delta / MAC_AMOUNT_FACTOR
+      }
 
            /* We try first with panels. */
 
diff --git a/CanvasApp/FloatingSpace/FloatingObject.js b/CanvasApp/FloatingSpace/FloatingObject.js
index 15f4dd0f3..68ff5f01a 100644
--- a/CanvasApp/FloatingSpace/FloatingObject.js
+++ b/CanvasApp/FloatingSpace/FloatingObject.js
@@ -366,6 +366,14 @@ function newFloatingObject () {
       }
     }
 
+    if (Math.abs(thisObject.currentHierarchyRing - thisObject.targetHierarchyRing) >= 1) {
+      if (thisObject.currentHierarchyRing < thisObject.targetHierarchyRing) {
+        thisObject.currentHierarchyRing = thisObject.currentHierarchyRing + 1
+      } else {
+        thisObject.currentHierarchyRing = thisObject.currentHierarchyRing - 1
+      }
+    }
+
     /* Floating object position in screen coordinates */
 
     thisObject.payload.position.x = thisObject.container.frame.position.x
@@ -473,7 +481,7 @@ function newFloatingObject () {
   }
 
   function initializeImageSize (suggestedValue) {
-    var size = suggestedValue
+    let size = suggestedValue
     if (size < 2) {
       size = 2
     }
diff --git a/CanvasApp/FloatingSpace/UiObject.js b/CanvasApp/FloatingSpace/UiObject.js
index a358fa014..02a0aef6d 100644
--- a/CanvasApp/FloatingSpace/UiObject.js
+++ b/CanvasApp/FloatingSpace/UiObject.js
@@ -1239,7 +1239,7 @@ function newUiObject () {
       let nodeDefinition = APP_SCHEMA_MAP.get(thisObject.payload.node.type)
       if (nodeDefinition !== undefined) {
         if (nodeDefinition.isHierarchyHead === true) {
-          VISIBLE_RADIUS = thisObject.container.frame.radius * 1.1
+          VISIBLE_RADIUS = thisObject.container.frame.radius * 1.4
           let OPACITY = 1
 
           browserCanvasContext.beginPath()
diff --git a/CanvasApp/Scales/TimeFrameScale.js b/CanvasApp/Scales/TimeFrameScale.js
index 856a1e15f..ab67a0bb9 100644
--- a/CanvasApp/Scales/TimeFrameScale.js
+++ b/CanvasApp/Scales/TimeFrameScale.js
@@ -45,6 +45,10 @@ function newTimeFrameScale () {
     }
   }
   setupContainer()
+
+  let wheelDeltaDirection
+  let wheelDeltaCounter = 0
+
   return thisObject
 
   function setupContainer () {
@@ -250,6 +254,37 @@ function newTimeFrameScale () {
 
   function onMouseWheel (event) {
     delta = event.wheelDelta
+
+    if (IS_MAC) {
+      if (delta < 0) {
+        if (wheelDeltaDirection === -1) {
+          wheelDeltaCounter++
+          if (wheelDeltaCounter < 5) {
+            return
+          } else {
+            wheelDeltaCounter = 0
+          }
+        } else {
+          wheelDeltaCounter = 0
+          wheelDeltaDirection = -1
+          return
+        }
+      } else {
+        if (wheelDeltaDirection === 1) {
+          wheelDeltaCounter++
+          if (wheelDeltaCounter < 5) {
+            return
+          } else {
+            wheelDeltaCounter = 0
+          }
+        } else {
+          wheelDeltaCounter = 0
+          wheelDeltaDirection = 1
+          return
+        }
+      }
+    }
+
     if (delta < 0) {
       timeFrameIndex--
       if (timeFrameIndex < 0) {