From 0b7ddb009dca37a3433def60898fbb9347cbc73a Mon Sep 17 00:00:00 2001
From: Ryan Huffman <ryanhuffman@gmail.com>
Date: Mon, 1 Dec 2014 16:33:51 -0800
Subject: [PATCH] Fix tabification of tool windows

---
 interface/src/ui/ToolWindow.cpp | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/interface/src/ui/ToolWindow.cpp b/interface/src/ui/ToolWindow.cpp
index 799402a486..da1d2c68f4 100644
--- a/interface/src/ui/ToolWindow.cpp
+++ b/interface/src/ui/ToolWindow.cpp
@@ -100,8 +100,17 @@ void ToolWindow::onChildVisibilityUpdated(bool visible) {
 }
 
 void ToolWindow::addDockWidget(Qt::DockWidgetArea area, QDockWidget* dockWidget) {
+    QList<QDockWidget*> dockWidgets = findChildren<QDockWidget*>();
+
     QMainWindow::addDockWidget(area, dockWidget);
 
+    // We want to force tabbing, so retabify all of our widgets.
+    QDockWidget* lastDockWidget = dockWidget;
+    foreach (QDockWidget* nextDockWidget, dockWidgets) {
+        tabifyDockWidget(lastDockWidget, nextDockWidget);
+        lastDockWidget = nextDockWidget;
+    }
+
     connect(dockWidget, &QDockWidget::visibilityChanged, this, &ToolWindow::onChildVisibilityUpdated);
 }