Showing the changes to libraries/script-engine/src/TabletScriptingInterface.cpp (1 of 6 files). Show all
Unified · Split
| @@ -29,10 +29,10 @@ QObject* TabletScriptingInterface::getTablet(const QString& tabletId) { · 28 unmodified lines | ||
| 29 | 29 | } |
| 30 | 30 | } |
| 31 | 31 | |
| 32 | −void TabletScriptingInterface::setQmlTabletRoot(QString tabletId, QQuickItem* qmlTabletRoot) { | |
| 32 | +void TabletScriptingInterface::setQmlTabletRoot(QString tabletId, QQuickItem* qmlTabletRoot, QObject* qmlOffscreenSurface) { | |
| 33 | 33 | TabletProxy* tablet = qobject_cast<TabletProxy*>(getTablet(tabletId)); |
| 34 | − if (tablet) { | |
| 35 | − tablet->setQmlTabletRoot(qmlTabletRoot); | |
| 34 | + if (tablet && qmlOffscreenSurface) { | |
| 35 | + tablet->setQmlTabletRoot(qmlTabletRoot, qmlOffscreenSurface); | |
| 36 | 36 | } else { |
| 37 | 37 | qCWarning(scriptengine) << "TabletScriptingInterface::setupTablet() bad tablet object"; |
| 38 | 38 | } |
| @@ -72,10 +72,12 @@ static void addButtonProxyToQmlTablet(QQuickItem* qmlTablet, TabletButtonProxy* · 33 unmodified lines | ||
| 72 | 72 | buttonProxy->setQmlButton(qobject_cast<QQuickItem*>(qmlButton)); |
| 73 | 73 | } |
| 74 | 74 | |
| 75 | −void TabletProxy::setQmlTabletRoot(QQuickItem* qmlTabletRoot) { | |
| 75 | +void TabletProxy::setQmlTabletRoot(QQuickItem* qmlTabletRoot, QObject* qmlOffscreenSurface) { | |
| 76 | 76 | std::lock_guard<std::mutex> guard(_mutex); |
| 77 | + _qmlOffscreenSurface = qmlOffscreenSurface; | |
| 77 | 78 | _qmlTabletRoot = qmlTabletRoot; |
| 78 | − if (_qmlTabletRoot) { | |
| 79 | + if (_qmlTabletRoot && _qmlOffscreenSurface) { | |
| 80 | + QObject::connect(_qmlOffscreenSurface, SIGNAL(webEventReceived(QVariant)), this, SIGNAL(webEventReceived(QVariant))); | |
| 79 | 81 | gotoHomeScreen(); |
| 80 | 82 | } else { |
| 81 | 83 | removeButtonsFromHomeScreen(); |
| @@ -141,6 +143,12 @@ void TabletProxy::removeButton(QObject* tabletButtonProxy) { · 59 unmodified lines | ||
| 141 | 143 | } |
| 142 | 144 | } |
| 143 | 145 | |
| 146 | +void TabletProxy::emitScriptEvent(QVariant msg) { | |
| 147 | + if (_qmlOffscreenSurface) { | |
| 148 | + QMetaObject::invokeMethod(_qmlOffscreenSurface, "emitScriptEvent", Qt::AutoConnection, Q_ARG(QVariant, msg)); | |
| 149 | + } | |
| 150 | +} | |
| 151 | + | |
| 144 | 152 | void TabletProxy::addButtonsToHomeScreen() { |
| 145 | 153 | auto tablet = getQmlTablet(); |
| 146 | 154 | if (!tablet) { |