History

fix dock widget context

danteruiz committed 7 years ago

Commit 0fae6151 parent 4ee39352 files · +4 −2Browse files

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

Unified · Split

interface/src/ui/InteractiveWindow.cpp+2−1
@@ -92,6 +92,8 @@ InteractiveWindow::InteractiveWindow(const QString& sourceUrl, const QVariantMap · 91 unmodified lines
92 92
93 auto mainWindow = qApp->getWindow();93 auto mainWindow = qApp->getWindow();
94 _dockWidget = std::shared_ptr<DockWidget>(new DockWidget(title, mainWindow), dockWidgetDeleter);94 _dockWidget = std::shared_ptr<DockWidget>(new DockWidget(title, mainWindow), dockWidgetDeleter);
95 auto quickView = _dockWidget->getQuickView();
96 Application::setupQmlSurface(quickView->rootContext(), true);
95 97
96 if (nativeWindowInfo.contains(DOCK_AREA_PROPERTY)) {98 if (nativeWindowInfo.contains(DOCK_AREA_PROPERTY)) {
97 DockArea dockedArea = (DockArea) nativeWindowInfo[DOCK_AREA_PROPERTY].toInt();99 DockArea dockedArea = (DockArea) nativeWindowInfo[DOCK_AREA_PROPERTY].toInt();
@@ -119,7 +121,6 @@ InteractiveWindow::InteractiveWindow(const QString& sourceUrl, const QVariantMap · 21 unmodified lines
119 }121 }
120 }122 }
121 123
122 auto quickView = _dockWidget->getQuickView();
123 QObject::connect(quickView.get(), &QQuickView::statusChanged, [&, this] (QQuickView::Status status) {124 QObject::connect(quickView.get(), &QQuickView::statusChanged, [&, this] (QQuickView::Status status) {
124 if (status == QQuickView::Ready) {125 if (status == QQuickView::Ready) {
125 QQuickItem* rootItem = _dockWidget->getRootItem();126 QQuickItem* rootItem = _dockWidget->getRootItem();