Mirrors/overte-thingvellir
3
0
Fork 0
mirror of https://thingvellir.net/git/overte synced 2025-03-27 23:52:03 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

better way to determine if we can go to the homescreen

Browse source
This commit is contained in:
Dante Ruiz 2017-03-08 17:42:24 +00:00
parent 656720ae36
commit 6acf2340a2
2 changed files with 8 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -275,7 +275,8 @@ void TabletProxy::setQmlTabletRoot(QQuickItem* qmlTabletRoot, QObject* qmlOffscr
QMetaObject::invokeMethod(_qmlTabletRoot, "loadSource", Q_ARG(const QVariant&, QVariant(TABLET_SOURCE_URL))); QMetaObject::invokeMethod(_qmlTabletRoot, "loadSource", Q_ARG(const QVariant&, QVariant(TABLET_SOURCE_URL)));
} }
gotoHomeScreen(); // force to the tablet to go to the homescreen
gotoHomeScreen(true);
QMetaObject::invokeMethod(_qmlTabletRoot, "setUsername", Q_ARG(const QVariant&, QVariant(getUsername()))); QMetaObject::invokeMethod(_qmlTabletRoot, "setUsername", Q_ARG(const QVariant&, QVariant(getUsername())));
@ -293,6 +294,9 @@ void TabletProxy::setQmlTabletRoot(QQuickItem* qmlTabletRoot, QObject* qmlOffscr
} }
} }
void TabletProxy::gotoHomeScreen() {
gotoHomeScreen(false);
}
void TabletProxy::gotoMenuScreen(const QString& submenu) { void TabletProxy::gotoMenuScreen(const QString& submenu) {
QObject* root = nullptr; QObject* root = nullptr;
@ -334,8 +338,8 @@ void TabletProxy::loadQMLSource(const QVariant& path) {
} }
} }
void TabletProxy::gotoHomeScreen() { void TabletProxy::gotoHomeScreen(bool forceOntoHomeScreen) {
if (_state != State::Home || _state != State::Uninitialized) { if (_state != State::Home && ( _state != State::Uninitialized || forceOntoHomeScreen)) {
if (!_toolbarMode && _qmlTabletRoot) { if (!_toolbarMode && _qmlTabletRoot) {
auto loader = _qmlTabletRoot->findChild<QQuickItem*>("loader"); auto loader = _qmlTabletRoot->findChild<QQuickItem*>("loader");
QObject::connect(loader, SIGNAL(loaded()), this, SLOT(addButtonsToHomeScreen()), Qt::DirectConnection); QObject::connect(loader, SIGNAL(loaded()), this, SLOT(addButtonsToHomeScreen()), Qt::DirectConnection);

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

@ -188,6 +188,7 @@ protected slots:
void desktopWindowClosed(); void desktopWindowClosed();
protected: protected:
void removeButtonsFromHomeScreen(); void removeButtonsFromHomeScreen();
void gotoHomeScreen(bool forceOntoHomeScreen);
void addButtonsToToolbar(); void addButtonsToToolbar();
void removeButtonsFromToolbar(); void removeButtonsFromToolbar();