From a79a75702a7f7437baa7e77f0085594e3ae16880 Mon Sep 17 00:00:00 2001
From: Preston Bezos <preston@highfidelity.io>
Date: Wed, 12 Jun 2019 09:17:18 -0700
Subject: [PATCH] reverted a couple of testing changes and added a variable

---
 interface/src/Application.cpp           | 3 +--
 scripts/simplifiedUI/ui/simplifiedUI.js | 3 ++-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/interface/src/Application.cpp b/interface/src/Application.cpp
index 547b8d387b..6d8e2a31af 100644
--- a/interface/src/Application.cpp
+++ b/interface/src/Application.cpp
@@ -978,7 +978,7 @@ Setting::Handle<int> sessionRunTime{ "sessionRunTime", 0 };
 
 const float DEFAULT_HMD_TABLET_SCALE_PERCENT = 60.0f;
 const float DEFAULT_DESKTOP_TABLET_SCALE_PERCENT = 75.0f;
-const bool DEFAULT_DESKTOP_TABLET_BECOMES_TOOLBAR = false;
+const bool DEFAULT_DESKTOP_TABLET_BECOMES_TOOLBAR = true;
 const bool DEFAULT_HMD_TABLET_BECOMES_TOOLBAR = false;
 const bool DEFAULT_PREFER_STYLUS_OVER_LASER = false;
 const bool DEFAULT_PREFER_AVATAR_FINGER_OVER_STYLUS = false;
@@ -9301,7 +9301,6 @@ void Application::updateSystemTabletMode() {
         if (isHMDMode()) {
             DependencyManager::get<TabletScriptingInterface>()->setToolbarMode(getHmdTabletBecomesToolbarSetting());
         } else {
-            //_desktopTabletBecomesToolbarSetting.set(false);
             DependencyManager::get<TabletScriptingInterface>()->setToolbarMode(getDesktopTabletBecomesToolbarSetting());
         }
     }
diff --git a/scripts/simplifiedUI/ui/simplifiedUI.js b/scripts/simplifiedUI/ui/simplifiedUI.js
index 7547f04fa2..54914118c2 100644
--- a/scripts/simplifiedUI/ui/simplifiedUI.js
+++ b/scripts/simplifiedUI/ui/simplifiedUI.js
@@ -457,6 +457,7 @@ function onGeometryChanged(rect) {
     }
 }
 
+var TIMEOUT_BEFORE_REHIDE_TOOLBAR_MS = 700
 function onDisplayModeChanged(isHMDMode) {
     if (isHMDMode) {
         Camera.setModeString("first person");
@@ -465,7 +466,7 @@ function onDisplayModeChanged(isHMDMode) {
         Script.setTimeout(function () {
             var toolbar = Toolbars.getToolbar(TOOLBAR_NAME);
             toolbar.writeProperty("visible", false);
-        }, 700);
+        }, TIMEOUT_BEFORE_REHIDE_TOOLBAR_MS);
     }
 }