History

Move dock window to ToolWindow

Ryan Huffman committed 11 years ago

Commit 604b1b61 parent 3658d655 files · +131 −4Browse files

Showing the changes to interface/src/scripting/WebWindowClass.cpp (1 of 5 files). Show all

Unified · Split

interface/src/scripting/WebWindowClass.cpp+5−1
@@ -37,7 +37,7 @@ WebWindowClass::WebWindowClass(const QString& title, const QString& url, int wid · 36 unmodified lines
3737 : QObject(NULL),
3838 _eventBridge(new ScriptEventBridge(this)) {
3939
40− QMainWindow* toolWindow = Application::getInstance()->getToolWindow();
40+ ToolWindow* toolWindow = Application::getInstance()->getToolWindow();
4141
4242 _dockWidget = new QDockWidget(title, toolWindow);
4343 _dockWidget->setFeatures(QDockWidget::DockWidgetMovable);
@@ -55,6 +55,10 @@ WebWindowClass::~WebWindowClass() { · 11 unmodified lines
5555 }
5656
5757 void WebWindowClass::setVisible(bool visible) {
58+ if (visible) {
59+ QMetaObject::invokeMethod(
60+ Application::getInstance()->getToolWindow(), "setVisible", Qt::BlockingQueuedConnection, Q_ARG(bool, visible));
61+ }
5862 QMetaObject::invokeMethod(_dockWidget, "setVisible", Qt::BlockingQueuedConnection, Q_ARG(bool, visible));
5963 }
6064