Showing the changes to libraries/script-engine/src/TabletScriptingInterface.cpp (1 of 1 file). Show all
Unified · Split
| @@ -368,13 +368,13 @@ void TabletProxy::addButtonsToMenuScreen() { · 367 unmodified lines | |||
| 368 | } | 368 | } |
| 369 | 369 | ||
| 370 | QQuickItem* VrMenu = loader->findChild<QQuickItem*>("tabletMenu"); | 370 | QQuickItem* VrMenu = loader->findChild<QQuickItem*>("tabletMenu"); |
| 371 | if (!VrMenu) { | 371 | if (VrMenu) { |
| 372 | return; | 372 | auto offscreenUi = DependencyManager::get<OffscreenUi>(); |
| 373 | QObject* menu = offscreenUi->getRootMenu(); | ||
| 374 | QMetaObject::invokeMethod(VrMenu, "setRootMenu", Qt::AutoConnection, Q_ARG(QVariant, QVariant::fromValue(menu))); | ||
| 373 | } | 375 | } |
| 374 | 376 | ||
| 375 | auto offscreenUi = DependencyManager::get<OffscreenUi>(); | 377 | QObject::disconnect(loader, SIGNAL(loaded()), this, SLOT(addButtonsToMenuScreen())); |
| 376 | QObject* menu = offscreenUi->getRootMenu(); | ||
| 377 | QMetaObject::invokeMethod(VrMenu, "setRootMenu", Qt::AutoConnection, Q_ARG(QVariant, QVariant::fromValue(menu))); | ||
| 378 | } | 378 | } |
| 379 | 379 | ||
| 380 | void TabletProxy::removeButtonsFromHomeScreen() { | 380 | void TabletProxy::removeButtonsFromHomeScreen() { |