History

Merge branch 'master' of github.com:highfidelity/hifi into snapshot-fix

Dante Ruiz committed 9 years ago

Commit e0f19942 parents 4e94aaa 05bf19363 files · +1891 −452Browse files

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

Unified · Split

libraries/script-engine/src/TabletScriptingInterface.cpp+8−0
@@ -275,6 +275,9 @@ void TabletProxy::emitWebEvent(QVariant msg) { · 274 unmodified lines
275 emit webEventReceived(msg);275 emit webEventReceived(msg);
276}276}
277 277
278bool TabletProxy::isPathLoaded(QVariant path) {
279 return path.toString() == _currentPathLoaded.toString();
280}
278void TabletProxy::setQmlTabletRoot(QQuickItem* qmlTabletRoot, QObject* qmlOffscreenSurface) {281void TabletProxy::setQmlTabletRoot(QQuickItem* qmlTabletRoot, QObject* qmlOffscreenSurface) {
279 std::lock_guard<std::mutex> guard(_mutex);282 std::lock_guard<std::mutex> guard(_mutex);
280 _qmlOffscreenSurface = qmlOffscreenSurface;283 _qmlOffscreenSurface = qmlOffscreenSurface;
@@ -322,6 +325,7 @@ void TabletProxy::setQmlTabletRoot(QQuickItem* qmlTabletRoot, QObject* qmlOffscr · 41 unmodified lines
322 removeButtonsFromHomeScreen();325 removeButtonsFromHomeScreen();
323 _state = State::Uninitialized;326 _state = State::Uninitialized;
324 emit screenChanged(QVariant("Closed"), QVariant(""));327 emit screenChanged(QVariant("Closed"), QVariant(""));
328 _currentPathLoaded = "";
325 }329 }
326}330}
327 331
@@ -345,6 +349,7 @@ void TabletProxy::gotoMenuScreen(const QString& submenu) { · 17 unmodified lines
345 QMetaObject::invokeMethod(root, "loadSource", Q_ARG(const QVariant&, QVariant(VRMENU_SOURCE_URL)));349 QMetaObject::invokeMethod(root, "loadSource", Q_ARG(const QVariant&, QVariant(VRMENU_SOURCE_URL)));
346 _state = State::Menu;350 _state = State::Menu;
347 emit screenChanged(QVariant("Menu"), QVariant(VRMENU_SOURCE_URL));351 emit screenChanged(QVariant("Menu"), QVariant(VRMENU_SOURCE_URL));
352 _currentPathLoaded = VRMENU_SOURCE_URL;
348 QMetaObject::invokeMethod(root, "setShown", Q_ARG(const QVariant&, QVariant(true)));353 QMetaObject::invokeMethod(root, "setShown", Q_ARG(const QVariant&, QVariant(true)));
349 }354 }
350}355}
@@ -396,6 +401,7 @@ void TabletProxy::loadQMLSource(const QVariant& path) { · 45 unmodified lines
396 QMetaObject::invokeMethod(root, "loadSource", Q_ARG(const QVariant&, path));401 QMetaObject::invokeMethod(root, "loadSource", Q_ARG(const QVariant&, path));
397 _state = State::QML;402 _state = State::QML;
398 emit screenChanged(QVariant("QML"), path);403 emit screenChanged(QVariant("QML"), path);
404 _currentPathLoaded = path;
399 QMetaObject::invokeMethod(root, "setShown", Q_ARG(const QVariant&, QVariant(true)));405 QMetaObject::invokeMethod(root, "setShown", Q_ARG(const QVariant&, QVariant(true)));
400 }406 }
401 } else {407 } else {
@@ -458,6 +464,7 @@ void TabletProxy::loadHomeScreen(bool forceOntoHomeScreen) { · 56 unmodified lines
458 }464 }
459 _state = State::Home;465 _state = State::Home;
460 emit screenChanged(QVariant("Home"), QVariant(TABLET_SOURCE_URL));466 emit screenChanged(QVariant("Home"), QVariant(TABLET_SOURCE_URL));
467 _currentPathLoaded = TABLET_SOURCE_URL;
461 }468 }
462}469}
463 470
@@ -502,6 +509,7 @@ void TabletProxy::gotoWebScreen(const QString& url, const QString& injectedJavaS · 38 unmodified lines
502 }509 }
503 _state = State::Web;510 _state = State::Web;
504 emit screenChanged(QVariant("Web"), QVariant(url));511 emit screenChanged(QVariant("Web"), QVariant(url));
512 _currentPathLoaded = QVariant(url);
505}513}
506 514
507QObject* TabletProxy::addButton(const QVariant& properties) {515QObject* TabletProxy::addButton(const QVariant& properties) {