Showing the changes to interface/src/scripting/WebWindowClass.cpp (1 of 3 files). Show all
Unified · Split
| @@ -39,22 +39,23 @@ WebWindowClass::WebWindowClass(const QString& title, const QString& url, int wid · 38 unmodified lines | |||
| 39 | 39 | ||
| 40 | QMainWindow* toolWindow = Application::getInstance()->getToolWindow(); | 40 | QMainWindow* toolWindow = Application::getInstance()->getToolWindow(); |
| 41 | 41 | ||
| 42 | _window = new QDockWidget(title, toolWindow); | 42 | _dockWidget = new QDockWidget(title, toolWindow); |
| 43 | QWebView* webView = new QWebView(_window); | 43 | _dockWidget->setFeatures(QDockWidget::DockWidgetMovable); |
| 44 | QWebView* webView = new QWebView(_dockWidget); | ||
| 44 | webView->page()->mainFrame()->addToJavaScriptWindowObject("EventBridge", _eventBridge); | 45 | webView->page()->mainFrame()->addToJavaScriptWindowObject("EventBridge", _eventBridge); |
| 45 | webView->setUrl(url); | 46 | webView->setUrl(url); |
| 46 | _window->setWidget(webView); | 47 | _dockWidget->setWidget(webView); |
| 47 | 48 | ||
| 48 | toolWindow->addDockWidget(Qt::RightDockWidgetArea, _window); | 49 | toolWindow->addDockWidget(Qt::RightDockWidgetArea, _dockWidget); |
| 49 | 50 | ||
| 50 | connect(this, &WebWindowClass::destroyed, _window, &QWidget::deleteLater); | 51 | connect(this, &WebWindowClass::destroyed, _dockWidget, &QWidget::deleteLater); |
| 51 | } | 52 | } |
| 52 | 53 | ||
| 53 | WebWindowClass::~WebWindowClass() { | 54 | WebWindowClass::~WebWindowClass() { |
| 54 | } | 55 | } |
| 55 | 56 | ||
| 56 | void WebWindowClass::setVisible(bool visible) { | 57 | void WebWindowClass::setVisible(bool visible) { |
| 57 | QMetaObject::invokeMethod(_window, "setVisible", Qt::BlockingQueuedConnection, Q_ARG(bool, visible)); | 58 | QMetaObject::invokeMethod(_dockWidget, "setVisible", Qt::BlockingQueuedConnection, Q_ARG(bool, visible)); |
| 58 | } | 59 | } |
| 59 | 60 | ||
| 60 | QScriptValue WebWindowClass::constructor(QScriptContext* context, QScriptEngine* engine) { | 61 | QScriptValue WebWindowClass::constructor(QScriptContext* context, QScriptEngine* engine) { |