From 856791c11d6e104b947a974cd0cd9508fa7c504d Mon Sep 17 00:00:00 2001
From: "Anthony J. Thibault" <tony@highfidelity.io>
Date: Mon, 19 Dec 2016 15:15:16 -0800
Subject: [PATCH] Made TabletRoot.qml the main tablet qml file.

This file uses a Loader node to load, Tablet.qml.
---
 interface/resources/qml/hifi/tablet/Tablet.qml       |  6 +++---
 .../src/RenderableWebEntityItem.cpp                  | 12 ++++++++----
 scripts/system/help.js                               |  1 -
 scripts/system/tablet-ui/tabletUI.js                 |  2 +-
 4 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/interface/resources/qml/hifi/tablet/Tablet.qml b/interface/resources/qml/hifi/tablet/Tablet.qml
index 8203b9f972..93d388b374 100644
--- a/interface/resources/qml/hifi/tablet/Tablet.qml
+++ b/interface/resources/qml/hifi/tablet/Tablet.qml
@@ -7,8 +7,8 @@ Item {
 
     property double miclevel: 0.8
 
-    width: 480
-    height: 720
+    width: parent.width
+    height: parent.height
 
     // used to look up a button by its uuid
     function findButtonIndex(uuid) {
@@ -171,7 +171,7 @@ Item {
             console.log("Tablet.onCompleted!");
             var component = Qt.createComponent("TabletButton.qml");
             var buttons = [];
-            for (var i = 0; i < 5; i++) {
+            for (var i = 0; i < 6; i++) {
                 var button = component.createObject(flowMain);
                 button.inDebugMode = true;
                 buttons.push(button);
diff --git a/libraries/entities-renderer/src/RenderableWebEntityItem.cpp b/libraries/entities-renderer/src/RenderableWebEntityItem.cpp
index a29d2c0b8e..8e95a22560 100644
--- a/libraries/entities-renderer/src/RenderableWebEntityItem.cpp
+++ b/libraries/entities-renderer/src/RenderableWebEntityItem.cpp
@@ -259,9 +259,13 @@ void RenderableWebEntityItem::loadSourceURL() {
         _webSurface->load(_sourceUrl, [&](QQmlContext* context, QObject* obj) {});
 
         // TABLET_UI_HACK: move this to overlays as well!
-        if (_webSurface->getRootItem() && _webSurface->getRootItem()->objectName() == "tablet") {
-            auto tabletScriptingInterface = DependencyManager::get<TabletScriptingInterface>();
-            tabletScriptingInterface->setQmlTablet("com.highfidelity.interface.tablet.system", _webSurface->getRootItem());
+        if (_webSurface->getRootItem() && _webSurface->getRootItem()->objectName() == "tabletRoot") {
+            auto loader = _webSurface->getRootItem()->findChild<QQuickItem*>("loader");
+            if (loader) {
+                auto tablet = loader->findChild<QQuickItem*>("tablet");
+                auto tabletScriptingInterface = DependencyManager::get<TabletScriptingInterface>();
+                tabletScriptingInterface->setQmlTablet("com.highfidelity.interface.tablet.system", tablet);
+            }
         }
     }
 }
@@ -363,7 +367,7 @@ void RenderableWebEntityItem::destroyWebSurface() {
         QQuickItem* rootItem = _webSurface->getRootItem();
 
         // TABLET_UI_HACK: move this to overlays as well!
-        if (rootItem && rootItem->objectName() == "tablet") {
+        if (rootItem && rootItem->objectName() == "tabletRoot") {
             auto tabletScriptingInterface = DependencyManager::get<TabletScriptingInterface>();
             tabletScriptingInterface->setQmlTablet("com.highfidelity.interface.tablet.system", nullptr);
         }
diff --git a/scripts/system/help.js b/scripts/system/help.js
index d1be9f6e79..c8e14a80a6 100644
--- a/scripts/system/help.js
+++ b/scripts/system/help.js
@@ -27,7 +27,6 @@
 
     Script.scriptEnding.connect(function () {
         tablet.removeButton(button);
-        button.clicked.disconnect(onClicked);
     });
 
 }()); // END LOCAL_SCOPE
diff --git a/scripts/system/tablet-ui/tabletUI.js b/scripts/system/tablet-ui/tabletUI.js
index 19eb7f3726..077485ea35 100644
--- a/scripts/system/tablet-ui/tabletUI.js
+++ b/scripts/system/tablet-ui/tabletUI.js
@@ -23,7 +23,7 @@
     function showTabletUI() {
         tabletShown = true;
         print("show tablet-ui");
-        UIWebTablet = new WebTablet("qml/hifi/tablet/Tablet.qml", null, null, tabletLocation);
+        UIWebTablet = new WebTablet("qml/hifi/tablet/TabletRoot.qml", null, null, tabletLocation);
         UIWebTablet.register();
         HMD.tabletID = UIWebTablet.webEntityID;