Showing the changes to libraries/script-engine/src/TabletScriptingInterface.cpp (1 of 63 files). Show all
Unified · Split
| @@ -275,6 +275,9 @@ void TabletProxy::emitWebEvent(QVariant msg) { · 274 unmodified lines | ||
| 275 | 275 | emit webEventReceived(msg); |
| 276 | 276 | } |
| 277 | 277 | |
| 278 | +bool TabletProxy::isPathLoaded(QVariant path) { | |
| 279 | + return path.toString() == _currentPathLoaded.toString(); | |
| 280 | +} | |
| 278 | 281 | void TabletProxy::setQmlTabletRoot(QQuickItem* qmlTabletRoot, QObject* qmlOffscreenSurface) { |
| 279 | 282 | std::lock_guard<std::mutex> guard(_mutex); |
| 280 | 283 | _qmlOffscreenSurface = qmlOffscreenSurface; |
| @@ -322,6 +325,7 @@ void TabletProxy::setQmlTabletRoot(QQuickItem* qmlTabletRoot, QObject* qmlOffscr · 41 unmodified lines | ||
| 322 | 325 | removeButtonsFromHomeScreen(); |
| 323 | 326 | _state = State::Uninitialized; |
| 324 | 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 | 349 | QMetaObject::invokeMethod(root, "loadSource", Q_ARG(const QVariant&, QVariant(VRMENU_SOURCE_URL))); |
| 346 | 350 | _state = State::Menu; |
| 347 | 351 | emit screenChanged(QVariant("Menu"), QVariant(VRMENU_SOURCE_URL)); |
| 352 | + _currentPathLoaded = VRMENU_SOURCE_URL; | |
| 348 | 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 | 401 | QMetaObject::invokeMethod(root, "loadSource", Q_ARG(const QVariant&, path)); |
| 397 | 402 | _state = State::QML; |
| 398 | 403 | emit screenChanged(QVariant("QML"), path); |
| 404 | + _currentPathLoaded = path; | |
| 399 | 405 | QMetaObject::invokeMethod(root, "setShown", Q_ARG(const QVariant&, QVariant(true))); |
| 400 | 406 | } |
| 401 | 407 | } else { |
| @@ -458,6 +464,7 @@ void TabletProxy::loadHomeScreen(bool forceOntoHomeScreen) { · 56 unmodified lines | ||
| 458 | 464 | } |
| 459 | 465 | _state = State::Home; |
| 460 | 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 | 510 | _state = State::Web; |
| 504 | 511 | emit screenChanged(QVariant("Web"), QVariant(url)); |
| 512 | + _currentPathLoaded = QVariant(url); | |
| 505 | 513 | } |
| 506 | 514 | |
| 507 | 515 | QObject* TabletProxy::addButton(const QVariant& properties) { |