Pass tablet QQuickItem to TabletScriptingInterface

Also, moved TabletScriptingInterface to script-engine library for easy access, baby.

interface/resources/qml/hifi/tablet/Tablet.qml

@@ -3,6 +3,7 @@ import QtGraphicalEffects 1.0
 
 Item {
     id: tablet
+    objectName: "tablet"
 
     property double miclevel: 0.8
 

interface/src/Application.cpp

@@ -104,6 +104,7 @@
 #include <ScriptCache.h>
 #include <SoundCache.h>
 #include <steamworks-wrapper/SteamClient.h>
+#include <TabletScriptingInterface.h>
 #include <Tooltip.h>
 #include <udt/PacketHeaders.h>
 #include <UserActivityLogger.h>
@@ -144,7 +145,6 @@
 #include "scripting/SettingsScriptingInterface.h"
 #include "scripting/WindowScriptingInterface.h"
 #include "scripting/ControllerScriptingInterface.h"
-#include "scripting/TabletScriptingInterface.h"
 #include "scripting/ToolbarScriptingInterface.h"
 #include "scripting/RatesScriptingInterface.h"
 #if defined(Q_OS_MAC) || defined(Q_OS_WIN)
@@ -5183,8 +5183,6 @@ void Application::registerScriptEngineWithApplicationServices(ScriptEngine* scri
     scriptEngine->registerGlobalObject("ScriptDiscoveryService", DependencyManager::get<ScriptEngines>().data());
     scriptEngine->registerGlobalObject("Reticle", getApplicationCompositor().getReticleInterface());
 
-    scriptEngine->registerGlobalObject("Tablet", DependencyManager::get<TabletScriptingInterface>().data());
-
     scriptEngine->registerGlobalObject("UserActivityLogger", DependencyManager::get<UserActivityLoggerScriptingInterface>().data());
     scriptEngine->registerGlobalObject("Users", DependencyManager::get<UsersScriptingInterface>().data());
 

libraries/entities-renderer/src/RenderableWebEntityItem.cpp

@@ -23,6 +23,7 @@
 #include <PathUtils.h>
 #include <TextureCache.h>
 #include <gpu/Context.h>
+#include <TabletScriptingInterface.h>
 
 #include "EntityTreeRenderer.h"
 #include "EntitiesRendererLogging.h"
@@ -255,7 +256,13 @@ void RenderableWebEntityItem::loadSourceURL() {
     } else {
         _contentType = qmlContent;
         _webSurface->setBaseUrl(QUrl::fromLocalFile(PathUtils::resourcesPath()));
-        _webSurface->load(_sourceUrl, [&](QQmlContext* context, QObject* obj) { });
+        _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->setupTablet("com.highfidelity.interface.tablet.system", _webSurface->getRootItem());
+        }
     }
 }
 

libraries/script-engine/src/ScriptEngine.cpp

@@ -62,6 +62,7 @@
 #include "WebSocketClass.h"
 #include "RecordingScriptingInterface.h"
 #include "ScriptEngines.h"
+#include "TabletScriptingInterface.h"
 
 #include "MIDIEvent.h"
 
@@ -542,6 +543,8 @@ void ScriptEngine::init() {
     auto recordingInterface = DependencyManager::get<RecordingScriptingInterface>();
     registerGlobalObject("Recording", recordingInterface.data());
 
+    registerGlobalObject("Tablet", DependencyManager::get<TabletScriptingInterface>().data());
+
     registerGlobalObject("Assets", &_assetScriptingInterface);
     registerGlobalObject("Resources", DependencyManager::get<ResourceScriptingInterface>().data());
 }

libraries/script-engine/src/TabletScriptingInterface.cpp

@@ -27,6 +27,11 @@ QObject* TabletScriptingInterface::getTablet(const QString& tabletId) {
     }
 }
 
+void TabletScriptingInterface::setupTablet(QString tabletId, QQuickItem* qmlTablet) {
+    // AJT: TODO
+    qDebug() << "AJT: setupTablet objname = " << qmlTablet->objectName();
+}
+
 //
 // TabletProxy
 //

libraries/script-engine/src/TabletScriptingInterface.h

@@ -14,6 +14,7 @@
 #include <QtCore/QObject>
 #include <QVariant>
 #include <QScriptValue>
+#include <QQuickItem>
 
 #include <DependencyManager.h>
 
@@ -34,6 +35,8 @@ public:
      * @return {TabletProxy} tablet instance
      */
     Q_INVOKABLE QObject* getTablet(const QString& tabletId);
+
+    void setupTablet(QString tabletId, QQuickItem* qmlTablet);
 protected:
     std::mutex _tabletProxiesMutex;
     std::map<QString, QSharedPointer<TabletProxy>> _tabletProxies;