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