From 536351e9d5053d731bab08b3a910fb8d071379c6 Mon Sep 17 00:00:00 2001 From: "James B. Pollack" Date: Wed, 14 Oct 2015 15:10:04 -0700 Subject: [PATCH] move set tab position to constructor --- interface/src/ui/ToolWindow.cpp | 5 ++--- interface/src/ui/ToolWindow.h | 2 +- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/interface/src/ui/ToolWindow.cpp b/interface/src/ui/ToolWindow.cpp index bb62929846..de4b3887db 100644 --- a/interface/src/ui/ToolWindow.cpp +++ b/interface/src/ui/ToolWindow.cpp @@ -22,6 +22,8 @@ ToolWindow::ToolWindow(QWidget* parent) : _hasShown(false), _lastGeometry() { + setTabPosition(Qt::TopDockWidgetArea, QTabWidget::TabPosition::North); + # ifndef Q_OS_LINUX setDockOptions(QMainWindow::ForceTabbedDocks); # endif @@ -120,12 +122,9 @@ 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); QMainWindow::addDockWidget(area, dockWidget, orientation); - // We want to force tabbing, so retabify all of our widgets. QDockWidget* lastDockWidget = dockWidget; foreach(QDockWidget* nextDockWidget, dockWidgets) { diff --git a/interface/src/ui/ToolWindow.h b/interface/src/ui/ToolWindow.h index 03ae85a418..43ab1ac2ce 100644 --- a/interface/src/ui/ToolWindow.h +++ b/interface/src/ui/ToolWindow.h @@ -7,7 +7,7 @@ // // Distributed under the Apache License, Version 2.0. // See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html -// +// #ifndef hifi_ToolWindow_h #define hifi_ToolWindow_h