From 815b263954da579feb22f49fd53ff2767cdc6a9c Mon Sep 17 00:00:00 2001 From: "James B. Pollack" Date: Wed, 14 Oct 2015 13:26:19 -0700 Subject: [PATCH] convert tabs to spaces --- interface/src/scripting/WebWindowClass.cpp | 2 +- interface/src/ui/ToolWindow.cpp | 22 ++++++++++++---------- 2 files changed, 13 insertions(+), 11 deletions(-) diff --git a/interface/src/scripting/WebWindowClass.cpp b/interface/src/scripting/WebWindowClass.cpp index c78312e57a..7e998ed8ff 100644 --- a/interface/src/scripting/WebWindowClass.cpp +++ b/interface/src/scripting/WebWindowClass.cpp @@ -52,7 +52,7 @@ WebWindowClass::WebWindowClass(const QString& title, const QString& url, int wid dockWidget->setWidget(_webView); - toolWindow->addDockWidget(Qt::TopDockWidgetArea, dockWidget, Qt::Horizontal); + toolWindow->addDockWidget(Qt::TopDockWidgetArea, dockWidget, Qt::Horizontal); _windowWidget = dockWidget; } else { diff --git a/interface/src/ui/ToolWindow.cpp b/interface/src/ui/ToolWindow.cpp index 78131c9a95..a1a108ab17 100644 --- a/interface/src/ui/ToolWindow.cpp +++ b/interface/src/ui/ToolWindow.cpp @@ -109,6 +109,7 @@ void ToolWindow::addDockWidget(Qt::DockWidgetArea area, QDockWidget* dockWidget) // We want to force tabbing, so retabify all of our widgets. QDockWidget* lastDockWidget = dockWidget; + foreach (QDockWidget* nextDockWidget, dockWidgets) { tabifyDockWidget(lastDockWidget, nextDockWidget); lastDockWidget = nextDockWidget; @@ -118,18 +119,19 @@ void ToolWindow::addDockWidget(Qt::DockWidgetArea area, QDockWidget* dockWidget) } void ToolWindow::addDockWidget(Qt::DockWidgetArea area, QDockWidget* dockWidget, Qt::Orientation orientation) { - QList dockWidgets = findChildren(); - - setTabPosition(Qt::TopDockWidgetArea, QTabWidget::TabPosition::North); + QList dockWidgets = findChildren(); + + setTabPosition(Qt::TopDockWidgetArea, QTabWidget::TabPosition::North); - QMainWindow::addDockWidget(area, dockWidget, orientation); + addDockWidget(area, dockWidget, orientation); - // We want to force tabbing, so retabify all of our widgets. - QDockWidget* lastDockWidget = dockWidget; - foreach(QDockWidget* nextDockWidget, dockWidgets) { - tabifyDockWidget(lastDockWidget, nextDockWidget); - lastDockWidget = nextDockWidget; - } + // 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); }