Showing the changes to interface/src/ui/InteractiveWindow.cpp (1 of 1 file). Show all
Unified · Split
| @@ -137,12 +137,15 @@ InteractiveWindow::InteractiveWindow(const QString& sourceUrl, const QVariantMap · 136 unmodified lines | |||
| 137 | presentationMode = (InteractiveWindowPresentationMode) properties[PRESENTATION_MODE_PROPERTY].toInt(); | 137 | presentationMode = (InteractiveWindowPresentationMode) properties[PRESENTATION_MODE_PROPERTY].toInt(); |
| 138 | } | 138 | } |
| 139 | 139 | ||
| 140 | _interactiveWindowProxy= std::unique_ptr<InteractiveWindowProxy, std::function<void(InteractiveWindowProxy*)>>(new InteractiveWindowProxy, [](InteractiveWindowProxy *p) { | 140 | _interactiveWindowProxy= std::unique_ptr<InteractiveWindowProxy, |
| 141 | p->deleteLater(); | 141 | std::function<void(InteractiveWindowProxy*)>>(new InteractiveWindowProxy, [](InteractiveWindowProxy *p) { |
| 142 | p->deleteLater(); | ||
| 142 | }); | 143 | }); |
| 143 | 144 | ||
| 144 | QObject::connect(_interactiveWindowProxy.get(), &InteractiveWindowProxy::webEventReceived, this, &InteractiveWindow::emitWebEvent, Qt::QueuedConnection); | 145 | QObject::connect(_interactiveWindowProxy.get(), &InteractiveWindowProxy::webEventReceived, |
| 145 | QObject::connect(this, &InteractiveWindow::scriptEventReceived, _interactiveWindowProxy.get(), &InteractiveWindowProxy::emitScriptEvent, Qt::QueuedConnection); | 146 | this, &InteractiveWindow::emitWebEvent, Qt::QueuedConnection); |
| 147 | QObject::connect(this, &InteractiveWindow::scriptEventReceived, _interactiveWindowProxy.get(), | ||
| 148 | &InteractiveWindowProxy::emitScriptEvent, Qt::QueuedConnection); | ||
| 146 | 149 | ||
| 147 | if (properties.contains(DOCKED_PROPERTY) && presentationMode == InteractiveWindowPresentationMode::Native) { | 150 | if (properties.contains(DOCKED_PROPERTY) && presentationMode == InteractiveWindowPresentationMode::Native) { |
| 148 | QVariantMap nativeWindowInfo = properties[DOCKED_PROPERTY].toMap(); | 151 | QVariantMap nativeWindowInfo = properties[DOCKED_PROPERTY].toMap(); |