Showing the changes to libraries/script-engine/src/TabletScriptingInterface.cpp (1 of 4 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 | } |
| @@ -364,6 +369,7 @@ void TabletProxy::loadQMLSource(const QVariant& path) { · 13 unmodified lines | ||
| 364 | 369 | QMetaObject::invokeMethod(root, "loadSource", Q_ARG(const QVariant&, path)); |
| 365 | 370 | _state = State::QML; |
| 366 | 371 | emit screenChanged(QVariant("QML"), path); |
| 372 | + _currentPathLoaded = path; | |
| 367 | 373 | QMetaObject::invokeMethod(root, "setShown", Q_ARG(const QVariant&, QVariant(true))); |
| 368 | 374 | } |
| 369 | 375 | } else { |
| @@ -426,6 +432,7 @@ void TabletProxy::loadHomeScreen(bool forceOntoHomeScreen) { · 56 unmodified lines | ||
| 426 | 432 | } |
| 427 | 433 | _state = State::Home; |
| 428 | 434 | emit screenChanged(QVariant("Home"), QVariant(TABLET_SOURCE_URL)); |
| 435 | + _currentPathLoaded = TABLET_SOURCE_URL; | |
| 429 | 436 | } |
| 430 | 437 | } |
| 431 | 438 | |
| @@ -450,6 +457,7 @@ void TabletProxy::gotoWebScreen(const QString& url, const QString& injectedJavaS · 18 unmodified lines | ||
| 450 | 457 | } |
| 451 | 458 | _state = State::Web; |
| 452 | 459 | emit screenChanged(QVariant("Web"), QVariant(url)); |
| 460 | + _currentPathLoaded = QVariant(url); | |
| 453 | 461 | } |
| 454 | 462 | |
| 455 | 463 | QObject* TabletProxy::addButton(const QVariant& properties) { |