From 69252deb2e2152118364e5cdbac5fc134638bfd8 Mon Sep 17 00:00:00 2001
From: Seth Alves <seth.alves@gmail.com>
Date: Mon, 23 Jan 2017 16:28:56 -0800
Subject: [PATCH 1/2] close the tablet when going to a new domain

---
 interface/src/scripting/HMDScriptingInterface.h | 1 +
 interface/src/ui/AddressBarDialog.cpp           | 5 +++++
 2 files changed, 6 insertions(+)

diff --git a/interface/src/scripting/HMDScriptingInterface.h b/interface/src/scripting/HMDScriptingInterface.h
index 0b09278d16..bbf446456d 100644
--- a/interface/src/scripting/HMDScriptingInterface.h
+++ b/interface/src/scripting/HMDScriptingInterface.h
@@ -87,6 +87,7 @@ public:
     bool isMounted() const;
 
     void toggleShouldShowTablet() { _showTablet = !_showTablet; }
+    void setShouldShowTablet(bool value) { _showTablet = value; }
     bool getShouldShowTablet() const { return _showTablet; }
 
     void setCurrentTabletUIID(QUuid tabletID) { _tabletUIID = tabletID; }
diff --git a/interface/src/ui/AddressBarDialog.cpp b/interface/src/ui/AddressBarDialog.cpp
index ac566d68c7..c2e8dac65a 100644
--- a/interface/src/ui/AddressBarDialog.cpp
+++ b/interface/src/ui/AddressBarDialog.cpp
@@ -17,6 +17,7 @@
 #include "DependencyManager.h"
 #include "AddressManager.h"
 #include "DialogsManager.h"
+#include "scripting/HMDScriptingInterface.h"
 
 HIFI_QML_DEF(AddressBarDialog)
 
@@ -46,6 +47,8 @@ AddressBarDialog::AddressBarDialog(QQuickItem* parent) : OffscreenQmlDialog(pare
 void AddressBarDialog::loadAddress(const QString& address, bool fromSuggestions) {
     qDebug() << "Called LoadAddress with address " << address;
     if (!address.isEmpty()) {
+        auto HMD = DependencyManager::get<HMDScriptingInterface>();
+        HMD->setShouldShowTablet(false);
         DependencyManager::get<AddressManager>()->handleLookupString(address, fromSuggestions);
     }
 }
@@ -57,6 +60,8 @@ void AddressBarDialog::loadHome() {
     if (homeLocation == "") {
         homeLocation = DEFAULT_HOME_LOCATION;
     }
+    auto HMD = DependencyManager::get<HMDScriptingInterface>();
+    HMD->setShouldShowTablet(false);
     DependencyManager::get<AddressManager>()->handleLookupString(homeLocation);
 }
 

From 281b7a6eca6dd8b57b811f821b6a9ec8bd56084d Mon Sep 17 00:00:00 2001
From: Seth Alves <seth@highfidelity.io>
Date: Mon, 23 Jan 2017 16:49:05 -0800
Subject: [PATCH 2/2] close tablet anytime AddressManager::hostChanged fires

---
 interface/src/ui/AddressBarDialog.cpp | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/interface/src/ui/AddressBarDialog.cpp b/interface/src/ui/AddressBarDialog.cpp
index c2e8dac65a..25ecfc05c2 100644
--- a/interface/src/ui/AddressBarDialog.cpp
+++ b/interface/src/ui/AddressBarDialog.cpp
@@ -40,6 +40,10 @@ AddressBarDialog::AddressBarDialog(QQuickItem* parent) : OffscreenQmlDialog(pare
     _backEnabled = !(DependencyManager::get<AddressManager>()->getBackStack().isEmpty());
     _forwardEnabled = !(DependencyManager::get<AddressManager>()->getForwardStack().isEmpty());
     connect(addressManager.data(), &AddressManager::hostChanged, this, &AddressBarDialog::metaverseServerUrlChanged);
+    connect(addressManager.data(), &AddressManager::hostChanged, [](){
+        auto HMD = DependencyManager::get<HMDScriptingInterface>();
+        HMD->setShouldShowTablet(false);
+    });
     connect(DependencyManager::get<DialogsManager>().data(), &DialogsManager::setUseFeed, this, &AddressBarDialog::setUseFeed);
     connect(qApp, &Application::receivedHifiSchemeURL, this, &AddressBarDialog::receivedHifiSchemeURL);
 }
@@ -47,8 +51,6 @@ AddressBarDialog::AddressBarDialog(QQuickItem* parent) : OffscreenQmlDialog(pare
 void AddressBarDialog::loadAddress(const QString& address, bool fromSuggestions) {
     qDebug() << "Called LoadAddress with address " << address;
     if (!address.isEmpty()) {
-        auto HMD = DependencyManager::get<HMDScriptingInterface>();
-        HMD->setShouldShowTablet(false);
         DependencyManager::get<AddressManager>()->handleLookupString(address, fromSuggestions);
     }
 }
@@ -60,8 +62,6 @@ void AddressBarDialog::loadHome() {
     if (homeLocation == "") {
         homeLocation = DEFAULT_HOME_LOCATION;
     }
-    auto HMD = DependencyManager::get<HMDScriptingInterface>();
-    HMD->setShouldShowTablet(false);
     DependencyManager::get<AddressManager>()->handleLookupString(homeLocation);
 }