From c9919ff69d6798dbe46d2091936ba91e932559cc Mon Sep 17 00:00:00 2001
From: David Rowe <david@ctrlaltstudio.com>
Date: Tue, 16 Oct 2018 08:22:30 +1300
Subject: [PATCH] Hide mini tablet immediately upon near grabbing an entity

---
 scripts/system/miniTablet.js | 93 ++++++++++++++++++++++++------------
 1 file changed, 63 insertions(+), 30 deletions(-)

diff --git a/scripts/system/miniTablet.js b/scripts/system/miniTablet.js
index fdc00c1ebf..a2f0d074f0 100644
--- a/scripts/system/miniTablet.js
+++ b/scripts/system/miniTablet.js
@@ -23,12 +23,17 @@
         miniState = null,
 
         // Hands.
+        NO_HAND = -1,
         LEFT_HAND = 0,
         RIGHT_HAND = 1,
         HAND_NAMES = ["LeftHand", "RightHand"],
 
-        // Miscellaneous.
+        // Track controller grabbing state.
         HIFI_OBJECT_MANIPULATION_CHANNEL = "Hifi-Object-Manipulation",
+        grabbingHand = NO_HAND,
+        grabbedItem = null,
+
+        // Miscellaneous.
         tablet = Tablet.getTablet("com.highfidelity.interface.tablet.system"),
         DEBUG = false;
 
@@ -737,37 +742,11 @@
             setState(MINI_VISIBLE);
         }
 
-        function enterMiniShowing(hand) {
-            miniHand = hand;
-            ui.show(miniHand);
-            miniScaleStart = Date.now();
-            miniScaleTimer = Script.setTimeout(scaleMiniUp, MINI_SCALE_TIMEOUT);
-        }
-
-        function updateMiniShowing() {
-            if (HMD.showTablet) {
-                setState(MINI_HIDDEN);
-            }
-        }
-
-        function exitMiniShowing() {
-            if (miniScaleTimer) {
-                Script.clearTimeout(miniScaleTimer);
-                miniScaleTimer = null;
-            }
-        }
-
-        function updateMiniVisible() {
+        function checkMiniVisibility() {
             var showLeft,
                 showRight;
 
-            // Hide mini tablet if tablet proper has been displayed by other means.
-            if (HMD.showTablet) {
-                setState(MINI_HIDDEN);
-                return;
-            }
-
-            // Check that the mini tablet should still be visible and if so then ensure it's on the hand that the camera is 
+            // Check that the mini tablet should still be visible and if so then ensure it's on the hand that the camera is
             // gazing at.
             showLeft = shouldShowMini(LEFT_HAND);
             showRight = shouldShowMini(RIGHT_HAND);
@@ -790,8 +769,47 @@
                     setState(MINI_HIDING);
                 }
             } else {
-                setState(MINI_HIDING);
+                if (grabbedItem === null || grabbingHand !== miniHand) {
+                    setState(MINI_HIDING);
+                } else {
+                    setState(MINI_HIDDEN);
+                }
             }
+        }
+
+        function enterMiniShowing(hand) {
+            miniHand = hand;
+            ui.show(miniHand);
+            miniScaleStart = Date.now();
+            miniScaleTimer = Script.setTimeout(scaleMiniUp, MINI_SCALE_TIMEOUT);
+        }
+
+        function updateMiniShowing() {
+            // Hide mini tablet if tablet proper has been displayed by other means.
+            if (HMD.showTablet) {
+                setState(MINI_HIDDEN);
+            }
+
+            // Hide mini tablet if it should no longer be visible.
+            checkMiniVisibility();
+        }
+
+        function exitMiniShowing() {
+            if (miniScaleTimer) {
+                Script.clearTimeout(miniScaleTimer);
+                miniScaleTimer = null;
+            }
+        }
+
+        function updateMiniVisible() {
+            // Hide mini tablet if tablet proper has been displayed by other means.
+            if (HMD.showTablet) {
+                setState(MINI_HIDDEN);
+                return;
+            }
+
+            // Hide mini tablet if it should no longer be visible.
+            checkMiniVisibility();
 
             // If state hasn't changed, update mini tablet rotation.
             if (miniState === MINI_VISIBLE) {
@@ -973,6 +991,21 @@
             return;
         }
 
+        // Track grabbed state and item.
+        switch (message.action) {
+            case "grab":
+                grabbingHand = HAND_NAMES.indexOf(message.joint);
+                grabbedItem = message.grabbedEntity;
+                break;
+            case "release":
+                grabbingHand = NO_HAND;
+                grabbedItem = null;
+                break;
+            default:
+                error("Unexpected grab message!");
+                return;
+        }
+
         if (message.grabbedEntity !== HMD.tabletID && message.grabbedEntity !== ui.getMiniTabletID()) {
             return;
         }