From a1e2292e62e8daf155ff2711ca457f1e80e6dcb7 Mon Sep 17 00:00:00 2001 From: "James B. Pollack" Date: Wed, 14 Oct 2015 17:27:45 -0700 Subject: [PATCH] remove title bar from docked tool widgets --- interface/src/scripting/WebWindowClass.cpp | 1 + interface/src/ui/ToolWindow.cpp | 12 ++++++------ 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/interface/src/scripting/WebWindowClass.cpp b/interface/src/scripting/WebWindowClass.cpp index 7e998ed8ff..51f0448897 100644 --- a/interface/src/scripting/WebWindowClass.cpp +++ b/interface/src/scripting/WebWindowClass.cpp @@ -45,6 +45,7 @@ WebWindowClass::WebWindowClass(const QString& title, const QString& url, int wid auto dockWidget = new QDockWidget(title, toolWindow); dockWidget->setFeatures(QDockWidget::DockWidgetMovable); + dockWidget->setTitleBarWidget(0); connect(dockWidget, &QDockWidget::visibilityChanged, this, &WebWindowClass::visibilityChanged); _webView = new QWebView(dockWidget); diff --git a/interface/src/ui/ToolWindow.cpp b/interface/src/ui/ToolWindow.cpp index de4b3887db..f5dcf279c9 100644 --- a/interface/src/ui/ToolWindow.cpp +++ b/interface/src/ui/ToolWindow.cpp @@ -39,11 +39,8 @@ bool ToolWindow::event(QEvent* event) { QMainWindow* mainWindow = qApp->getWindow(); QRect mainGeometry = mainWindow->geometry(); - int titleBarHeight = UIUtil::getWindowTitleBarHeight(this); - int topMargin = titleBarHeight; - - _lastGeometry = QRect(mainGeometry.topLeft().x(), mainGeometry.topLeft().y() + topMargin, - DEFAULT_WIDTH, mainGeometry.height() - topMargin); + _lastGeometry = QRect(mainGeometry.topLeft().x(), mainGeometry.topLeft().y(), + DEFAULT_WIDTH, mainGeometry.height()); } setGeometry(_lastGeometry); return true; @@ -124,9 +121,12 @@ void ToolWindow::addDockWidget(Qt::DockWidgetArea area, QDockWidget* dockWidget, QList dockWidgets = findChildren(); QMainWindow::addDockWidget(area, dockWidget, orientation); - + + QDockWidget* lastDockWidget = dockWidget; + lastDockWidget->setTitleBarWidget(new QWidget()); + foreach(QDockWidget* nextDockWidget, dockWidgets) { tabifyDockWidget(lastDockWidget, nextDockWidget); lastDockWidget = nextDockWidget;