Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-21 06:44:06 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

fix tablet menu crashing

Browse source
This commit is contained in:
Dante Ruiz 2017-01-27 19:04:53 +00:00
parent 22a40f7ee7
commit 006c3a99dc
2 changed files with 2 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -203,6 +203,7 @@ void TabletProxy::setQmlTabletRoot(QQuickItem* qmlTabletRoot, QObject* qmlOffscr
void TabletProxy::gotoMenuScreen() {
if (_qmlTabletRoot) {
if (_state != State::Menu) {
removeButtonsFromHomeScreen();
auto loader = _qmlTabletRoot->findChild<QQuickItem*>("loader");
QObject::connect(loader, SIGNAL(loaded()), this, SLOT(addButtonsToMenuScreen()), Qt::DirectConnection);
QMetaObject::invokeMethod(_qmlTabletRoot, "loadSource", Q_ARG(const QVariant&, QVariant(VRMENU_SOURCE_URL)));

8
scripts/system/goto.js
View file

@ -20,13 +20,7 @@ var toolBar = null;
var tablet = null;
function onAddressBarShown(visible) {
if (tablet !== null) {
if (tablet.onHomeScreen === true) {
button.editProperties({isActive: visible});
}
} else {
button.editProperties({isActive: visible});
}
button.editProperties({isActive: visible});
}
function onClicked(){