From 8464a70c9e6f319a1b3c9c4761b32b33ffcdc8c1 Mon Sep 17 00:00:00 2001
From: David Rowe <david@ctrlaltstudio.com>
Date: Sat, 29 Sep 2018 12:42:41 +1200
Subject: [PATCH] Fix initial tablet scale

---
 scripts/system/libraries/utils.js    |  9 +++++----
 scripts/system/tablet-ui/tabletUI.js | 13 +++++++------
 2 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/scripts/system/libraries/utils.js b/scripts/system/libraries/utils.js
index f7b5f6db8d..f8928dd74a 100644
--- a/scripts/system/libraries/utils.js
+++ b/scripts/system/libraries/utils.js
@@ -356,13 +356,14 @@ getTabletWidthFromSettings = function () {
     var DEFAULT_TABLET_WIDTH = 0.4375;
     var tablet = Tablet.getTablet("com.highfidelity.interface.tablet.system");
     var toolbarMode = tablet.toolbarMode;
-    var DEFAULT_TABLET_SCALE = 70;
-    var tabletScalePercentage = DEFAULT_TABLET_SCALE;
+    var DEFAULT_DESKTOP_TABLET_SCALE = 75;
+    var DEFAULT_HMD_TABLET_SCALE = 60;
+    var tabletScalePercentage = DEFAULT_HMD_TABLET_SCALE;
     if (!toolbarMode) {
         if (HMD.active) {
-            tabletScalePercentage = Settings.getValue("hmdTabletScale") || DEFAULT_TABLET_SCALE;
+            tabletScalePercentage = Settings.getValue("hmdTabletScale") || DEFAULT_HMD_TABLET_SCALE;
         } else {
-            tabletScalePercentage = Settings.getValue("desktopTabletScale") || DEFAULT_TABLET_SCALE;
+            tabletScalePercentage = Settings.getValue("desktopTabletScale") || DEFAULT_DESKTOP_TABLET_SCALE;
         }
     }
     return DEFAULT_TABLET_WIDTH * (tabletScalePercentage / 100);
diff --git a/scripts/system/tablet-ui/tabletUI.js b/scripts/system/tablet-ui/tabletUI.js
index 80ddbeca8b..9a22014895 100644
--- a/scripts/system/tablet-ui/tabletUI.js
+++ b/scripts/system/tablet-ui/tabletUI.js
@@ -19,11 +19,12 @@
     var tabletRezzed = false;
     var activeHand = null;
     var DEFAULT_WIDTH = 0.4375;
-    var DEFAULT_TABLET_SCALE = 70;
+    var DEFAULT_DESKTOP_TABLET_SCALE = 75;
+    var DEFAULT_HMD_TABLET_SCALE = 60;
     var preMakeTime = Date.now();
     var validCheckTime = Date.now();
     var debugTablet = false;
-    var tabletScalePercentage = 70.0;
+    var tabletScalePercentage = DEFAULT_HMD_TABLET_SCALE;
     var UIWebTablet = null;
     var MSECS_PER_SEC = 1000.0;
     var MUTE_MICROPHONE_MENU_ITEM = "Mute Microphone";
@@ -66,14 +67,14 @@
     }
 
     function getTabletScalePercentageFromSettings() {
-        checkTablet()
+        checkTablet();
         var toolbarMode = gTablet.toolbarMode;
-        var tabletScalePercentage = DEFAULT_TABLET_SCALE;
+        var tabletScalePercentage = DEFAULT_HMD_TABLET_SCALE;
         if (!toolbarMode) {
             if (HMD.active) {
-                tabletScalePercentage = Settings.getValue("hmdTabletScale") || DEFAULT_TABLET_SCALE;
+                tabletScalePercentage = Settings.getValue("hmdTabletScale") || DEFAULT_HMD_TABLET_SCALE;
             } else {
-                tabletScalePercentage = Settings.getValue("desktopTabletScale") || DEFAULT_TABLET_SCALE;
+                tabletScalePercentage = Settings.getValue("desktopTabletScale") || DEFAULT_DESKTOP_TABLET_SCALE;
             }
         }
         return tabletScalePercentage;