Showing the changes to libraries/script-engine/src/TabletScriptingInterface.cpp (1 of 22 files). Show all
Unified · Split
| @@ -356,8 +356,15 @@ void TabletProxy::pushOntoStack(const QVariant& path) { · 355 unmodified lines | ||
| 356 | 356 | } else { |
| 357 | 357 | qCDebug(scriptengine) << "tablet cannot push QML because _qmlTabletRoot doesn't have child stack"; |
| 358 | 358 | } |
| 359 | + } else if (_desktopWindow) { | |
| 360 | + auto stack = _desktopWindow->asQuickItem()->findChild<QQuickItem*>("stack"); | |
| 361 | + if (stack) { | |
| 362 | + QMetaObject::invokeMethod(stack, "pushSource", Q_ARG(const QVariant&, path)); | |
| 363 | + } else { | |
| 364 | + qCDebug(scriptengine) << "tablet cannot push QML because _desktopWindow doesn't have child stack"; | |
| 365 | + } | |
| 359 | 366 | } else { |
| 360 | − qCDebug(scriptengine) << "tablet cannot push QML because _qmlTabletRoot is null"; | |
| 367 | + qCDebug(scriptengine) << "tablet cannot push QML because _qmlTabletRoot or _desktopWindow is null"; | |
| 361 | 368 | } |
| 362 | 369 | } |
| 363 | 370 | |
| @@ -367,10 +374,17 @@ void TabletProxy::popFromStack() { · 3 unmodified lines | ||
| 367 | 374 | if (stack) { |
| 368 | 375 | QMetaObject::invokeMethod(stack, "popSource"); |
| 369 | 376 | } else { |
| 370 | − qCDebug(scriptengine) << "tablet cannot pop QML because _qmlTabletRoot doesn't have child stack"; | |
| 377 | + qCDebug(scriptengine) << "tablet cannot push QML because _qmlTabletRoot doesn't have child stack"; | |
| 378 | + } | |
| 379 | + } else if (_desktopWindow) { | |
| 380 | + auto stack = _desktopWindow->asQuickItem()->findChild<QQuickItem*>("stack"); | |
| 381 | + if (stack) { | |
| 382 | + QMetaObject::invokeMethod(stack, "popSource"); | |
| 383 | + } else { | |
| 384 | + qCDebug(scriptengine) << "tablet cannot pop QML because _desktopWindow doesn't have child stack"; | |
| 371 | 385 | } |
| 372 | 386 | } else { |
| 373 | − qCDebug(scriptengine) << "tablet cannot pop QML because _qmlTabletRoot is null"; | |
| 387 | + qCDebug(scriptengine) << "tablet cannot pop QML because _qmlTabletRoot or _desktopWindow is null"; | |
| 374 | 388 | } |
| 375 | 389 | } |
| 376 | 390 | |