Showing the changes to libraries/script-engine/src/TabletScriptingInterface.cpp (1 of 9 files). Show all
Unified · Split
| @@ -100,9 +100,9 @@ void TabletProxy::setQmlTabletRoot(QQuickItem* qmlTabletRoot, QObject* qmlOffscr · 99 unmodified lines | ||
| 100 | 100 | |
| 101 | 101 | void TabletProxy::gotoMenuScreen() { |
| 102 | 102 | if (_qmlTabletRoot) { |
| 103 | − _qmlTabletRoot->setProperty(LOADER_SOURCE_PROPERTY_NAME, TABLET_SOURCE_URL); | |
| 104 | − //auto loader = _qmlTabletRoot->findChild<QQuickItem*>("loader"); | |
| 105 | − //QObject::connect(loader, SIGNAL(loaded()), this, SLOT(addButtonsToMenuScreen())); | |
| 103 | + _qmlTabletRoot->setProperty(LOADER_SOURCE_PROPERTY_NAME, VRMENU_SOURCE_URL); | |
| 104 | + auto loader = _qmlTabletRoot->findChild<QQuickItem*>("loader"); | |
| 105 | + QObject::connect(loader, SIGNAL(loaded()), this, SLOT(addButtonsToMenuScreen())); | |
| 106 | 106 | QMetaObject::invokeMethod(_qmlTabletRoot, "loadSource", Q_ARG(const QVariant&, QVariant(VRMENU_SOURCE_URL))); |
| 107 | 107 | } |
| 108 | 108 | } |
| @@ -172,7 +172,7 @@ void TabletProxy::removeButton(QObject* tabletButtonProxy) { · 63 unmodified lines | ||
| 172 | 172 | void TabletProxy::updateAudioBar(const double micLevel) { |
| 173 | 173 | auto tablet = getQmlTablet(); |
| 174 | 174 | if (!tablet) { |
| 175 | − qCCritical(scriptengine) << "Could not find tablet in TabletRoot.qml"; | |
| 175 | + //qCCritical(scriptengine) << "Could not find tablet in TabletRoot.qml"; | |
| 176 | 176 | } else { |
| 177 | 177 | QMetaObject::invokeMethod(tablet, "setMicLevel", Qt::AutoConnection, Q_ARG(QVariant, QVariant(micLevel))); |
| 178 | 178 | } |
| @@ -208,14 +208,15 @@ void TabletProxy::addButtonsToMenuScreen() { · 29 unmodified lines | ||
| 208 | 208 | return; |
| 209 | 209 | } |
| 210 | 210 | |
| 211 | − QQuickItem* VrMenu = loader->findChild<QQuickItem*>("VrMenu"); | |
| 211 | + QQuickItem* VrMenu = loader->findChild<QQuickItem*>("tabletMenu"); | |
| 212 | 212 | if (!VrMenu) { |
| 213 | 213 | qDebug() << "----------> could not find vr menu"; |
| 214 | 214 | return; |
| 215 | 215 | } |
| 216 | 216 | |
| 217 | − QString name = "Menu"; | |
| 218 | − QVariant returnedValue; | |
| 217 | + auto offscreenUi = DependencyManager::get<OffscreenUi>(); | |
| 218 | + QObject* menu = offscreenUi->getRootMenu(); | |
| 219 | + QMetaObject::invokeMethod(VrMenu, "setRootMenu", Qt::AutoConnection, Q_ARG(QVariant, QVariant::fromValue(menu))); | |
| 219 | 220 | } |
| 220 | 221 | |
| 221 | 222 | void TabletProxy::removeButtonsFromHomeScreen() { |