History

Merge pull request #9817 from druiz17/goto-home-bug

cant call gotohomescreen when tablet is closed

Seth Alves committed 9 years ago

Commit 2068b932 parents b1079d3 e9086462 files · +8 −3Browse files

Showing the changes to libraries/script-engine/src/TabletScriptingInterface.cpp (1 of 2 files). Show all

Unified · Split

libraries/script-engine/src/TabletScriptingInterface.cpp+7−3
@@ -287,7 +287,8 @@ void TabletProxy::setQmlTabletRoot(QQuickItem* qmlTabletRoot, QObject* qmlOffscr · 286 unmodified lines
287 QMetaObject::invokeMethod(_qmlTabletRoot, "loadSource", Q_ARG(const QVariant&, QVariant(TABLET_SOURCE_URL)));287 QMetaObject::invokeMethod(_qmlTabletRoot, "loadSource", Q_ARG(const QVariant&, QVariant(TABLET_SOURCE_URL)));
288 }288 }
289 289
290 gotoHomeScreen();290 // force to the tablet to go to the homescreen
291 loadHomeScreen(true);
291 292
292 QMetaObject::invokeMethod(_qmlTabletRoot, "setUsername", Q_ARG(const QVariant&, QVariant(getUsername())));293 QMetaObject::invokeMethod(_qmlTabletRoot, "setUsername", Q_ARG(const QVariant&, QVariant(getUsername())));
293 294
@@ -305,6 +306,9 @@ void TabletProxy::setQmlTabletRoot(QQuickItem* qmlTabletRoot, QObject* qmlOffscr · 11 unmodified lines
305 }306 }
306}307}
307 308
309void TabletProxy::gotoHomeScreen() {
310 loadHomeScreen(false);
311}
308void TabletProxy::gotoMenuScreen(const QString& submenu) {312void TabletProxy::gotoMenuScreen(const QString& submenu) {
309 313
310 QObject* root = nullptr;314 QObject* root = nullptr;
@@ -388,8 +392,8 @@ void TabletProxy::popFromStack() { · 77 unmodified lines
388 }392 }
389}393}
390 394
391void TabletProxy::gotoHomeScreen() {395void TabletProxy::loadHomeScreen(bool forceOntoHomeScreen) {
392 if (_state != State::Home) {396 if (_state != State::Home && ( _state != State::Uninitialized || forceOntoHomeScreen)) {
393 if (!_toolbarMode && _qmlTabletRoot) {397 if (!_toolbarMode && _qmlTabletRoot) {
394 auto loader = _qmlTabletRoot->findChild<QQuickItem*>("loader");398 auto loader = _qmlTabletRoot->findChild<QQuickItem*>("loader");
395 QObject::connect(loader, SIGNAL(loaded()), this, SLOT(addButtonsToHomeScreen()), Qt::DirectConnection);399 QObject::connect(loader, SIGNAL(loaded()), this, SLOT(addButtonsToHomeScreen()), Qt::DirectConnection);