1 files changed, 22 insertions, 1 deletions
diff --git a/Swift/QtUI/Trellis/QtDynamicGridLayout.cpp b/Swift/QtUI/Trellis/QtDynamicGridLayout.cpp
index 2509b3f..2402529 100644
--- a/Swift/QtUI/Trellis/QtDynamicGridLayout.cpp
+++ b/Swift/QtUI/Trellis/QtDynamicGridLayout.cpp
@@ -21,11 +21,11 @@
 #include <Swift/QtUI/QtTabbable.h>
 #include <Swift/QtUI/Trellis/QtDNDTabBar.h>
 
 namespace Swift {
 
-QtDynamicGridLayout::QtDynamicGridLayout(QWidget* parent, bool enableDND) : QWidget(parent), dndEnabled_(enableDND), movingTab_(nullptr) {
+QtDynamicGridLayout::QtDynamicGridLayout(bool future, QWidget* parent, bool enableDND) : QWidget(parent), dndEnabled_(enableDND), movingTab_(nullptr), future_(future) {
     gridLayout_ = new QGridLayout(this);
     setContentsMargins(0,0,0,0);
     setDimensions(QSize(1,1));
     connect(qApp, SIGNAL(focusChanged(QWidget*, QWidget*)), this, SLOT(handleApplicationFocusChanged(QWidget*,QWidget*)));
 }
@@ -47,10 +47,13 @@ int QtDynamicGridLayout::addTab(QtTabbable* tab, const QString& title) {
     QtTabWidget* tabWidget = dynamic_cast<QtTabWidget*>(item ? item->widget() : nullptr);
     if (tabWidget) {
         tabWidget->addTab(tab, title);
     }
     tab->setEmphasiseFocus(getDimension().width() > 1 || getDimension().height() > 1);
+    if (future_) {
+        showHideFirstTabs(); // FIXME: Putting it here as a workaround until I work out why it doesn't work initially
+    }
     return tabWidget ? indexOf(tab) : -1;
 }
 
 int QtDynamicGridLayout::count() const {
     int count = 0;
@@ -326,10 +329,28 @@ void QtDynamicGridLayout::setDimensions(const QSize& dim) {
 
     resizing_ = false;
     setCurrentWidget(restoredWidget);
 
     updateEmphasiseFocusOnTabs();
+
+    if (future_) {
+        showHideFirstTabs();
+    }
+}
+
+void QtDynamicGridLayout::showHideFirstTabs() {
+    int tmp;
+    auto firstTabs = indexToTabWidget(0, tmp);
+
+    if (firstTabs) {
+        if (gridLayout_->columnCount() == 1 && gridLayout_->rowCount() == 1) {
+            firstTabs->tabBar()->hide();
+        }
+        else {
+            firstTabs->tabBar()->show();
+        }
+    }
 }
 
 void QtDynamicGridLayout::updateEmphasiseFocusOnTabs() {
     const auto currentDimensions = getDimension();