Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-05-08 23:48:20 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

commit chabges

Browse source
This commit is contained in:
Dante Ruiz 2017-01-05 17:58:42 +00:00
parent c99f897db1
commit 3fab901b49
2 changed files with 32 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
interface/resources/qml/hifi/tablet/TabletMenu.qml Normal file
View file

@ -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"
}
}

25
libraries/script-engine/src/TabletScriptingInterface.cpp
View file

@ -58,7 +58,7 @@ void TabletScriptingInterface::setQmlTabletRoot(QString tabletId, QQuickItem* qm
static const char* TABLET_SOURCE_URL = "Tablet.qml"; static const char* TABLET_SOURCE_URL = "Tablet.qml";
static const char* WEB_VIEW_SOURCE_URL = "TabletWebView.qml"; static const char* WEB_VIEW_SOURCE_URL = "TabletWebView.qml";
static const char* LOADER_SOURCE_PROPERTY_NAME = "LoaderSource"; 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) { TabletProxy::TabletProxy(QString name) : _name(name) {
; ;
@ -101,9 +101,8 @@ void TabletProxy::setQmlTabletRoot(QQuickItem* qmlTabletRoot, QObject* qmlOffscr
void TabletProxy::gotoMenuScreen() { void TabletProxy::gotoMenuScreen() {
if (_qmlTabletRoot) { if (_qmlTabletRoot) {
_qmlTabletRoot->setProperty(LOADER_SOURCE_PROPERTY_NAME, TABLET_SOURCE_URL); _qmlTabletRoot->setProperty(LOADER_SOURCE_PROPERTY_NAME, TABLET_SOURCE_URL);
auto loader = _qmlTabletRoot->findChild<QQuickItem*>("loader"); //auto loader = _qmlTabletRoot->findChild<QQuickItem*>("loader");
auto offscreenUi = DependencyManager::get<OffscreenUi>(); //QObject::connect(loader, SIGNAL(loaded()), this, SLOT(addButtonsToMenuScreen()));
auto rootMenu = offscreenUi->getRootMenu();
QMetaObject::invokeMethod(_qmlTabletRoot, "loadSource", Q_ARG(const QVariant&, QVariant(VRMENU_SOURCE_URL))); QMetaObject::invokeMethod(_qmlTabletRoot, "loadSource", Q_ARG(const QVariant&, QVariant(VRMENU_SOURCE_URL)));
} }
} }
@ -200,7 +199,23 @@ void TabletProxy::addButtonsToHomeScreen() {
} }
void TabletProxy::addButtonsToMenuScreen() { void TabletProxy::addButtonsToMenuScreen() {
if (!_qmlTabletRoot) {
return;
}
auto loader = _qmlTabletRoot->findChild<QQuickItem*>("loader");
if (!loader) {
return;
}
QQuickItem* VrMenu = loader->findChild<QQuickItem*>("VrMenu");
if (!VrMenu) {
qDebug() << "----------> could not find vr menu";
return;
}
QString name = "Menu";
QVariant returnedValue;
} }
void TabletProxy::removeButtonsFromHomeScreen() { void TabletProxy::removeButtonsFromHomeScreen() {