diff --git a/interface/resources/qml/hifi/tablet/TabletMenu.qml b/interface/resources/qml/hifi/tablet/TabletMenu.qml new file mode 100644 index 0000000000..00227a6312 --- /dev/null +++ b/interface/resources/qml/hifi/tablet/TabletMenu.qml @@ -0,0 +1,12 @@ +import QtQuick 2.0 +import QtGraphicalEffects 1.0 +"../../menus" +Item { + id: tabletMenu + objectName: "menu" + property var rootMenu: Menu { objectName: "rootMenu" } + + Rectangle { + color: "#2b2b2b" + } +} diff --git a/libraries/script-engine/src/TabletScriptingInterface.cpp b/libraries/script-engine/src/TabletScriptingInterface.cpp index 3b5c292f26..f740a508a9 100644 --- a/libraries/script-engine/src/TabletScriptingInterface.cpp +++ b/libraries/script-engine/src/TabletScriptingInterface.cpp @@ -58,7 +58,7 @@ void TabletScriptingInterface::setQmlTabletRoot(QString tabletId, QQuickItem* qm static const char* TABLET_SOURCE_URL = "Tablet.qml"; static const char* WEB_VIEW_SOURCE_URL = "TabletWebView.qml"; static const char* LOADER_SOURCE_PROPERTY_NAME = "LoaderSource"; -static const char* VRMENU_SOURCE_URL = "VrMenuView.qml"; +static const char* VRMENU_SOURCE_URL = "TabletMenu.qml"; TabletProxy::TabletProxy(QString name) : _name(name) { ; @@ -101,9 +101,8 @@ void TabletProxy::setQmlTabletRoot(QQuickItem* qmlTabletRoot, QObject* qmlOffscr void TabletProxy::gotoMenuScreen() { if (_qmlTabletRoot) { _qmlTabletRoot->setProperty(LOADER_SOURCE_PROPERTY_NAME, TABLET_SOURCE_URL); - auto loader = _qmlTabletRoot->findChild("loader"); - auto offscreenUi = DependencyManager::get(); - auto rootMenu = offscreenUi->getRootMenu(); + //auto loader = _qmlTabletRoot->findChild("loader"); + //QObject::connect(loader, SIGNAL(loaded()), this, SLOT(addButtonsToMenuScreen())); QMetaObject::invokeMethod(_qmlTabletRoot, "loadSource", Q_ARG(const QVariant&, QVariant(VRMENU_SOURCE_URL))); } } @@ -200,7 +199,23 @@ void TabletProxy::addButtonsToHomeScreen() { } void TabletProxy::addButtonsToMenuScreen() { - + if (!_qmlTabletRoot) { + return; + } + + auto loader = _qmlTabletRoot->findChild("loader"); + if (!loader) { + return; + } + + QQuickItem* VrMenu = loader->findChild("VrMenu"); + if (!VrMenu) { + qDebug() << "----------> could not find vr menu"; + return; + } + + QString name = "Menu"; + QVariant returnedValue; } void TabletProxy::removeButtonsFromHomeScreen() {