History

addressing comment

amer cerkic committed 7 years ago

Commit 854f89c1 parent 1f4b1491 file · +7 −4Browse files

Showing the changes to interface/src/ui/InteractiveWindow.cpp (1 of 1 file). Show all

Unified · Split

interface/src/ui/InteractiveWindow.cpp+7−4
@@ -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();

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t