3 files changed, 28 insertions, 5 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
@@ -17,19 +17,19 @@
 #include <Swiften/Base/Log.h>
 
 #include <Swift/QtUI/QtSwiftUtil.h>
 #include <Swift/QtUI/QtTabWidget.h>
 #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*)));
 }
 
 QtDynamicGridLayout::~QtDynamicGridLayout() {
 }
 
@@ -43,18 +43,21 @@ int QtDynamicGridLayout::addTab(QtTabbable* tab, const QString& title) {
 
     lastPos = QPoint(qMin(lastPos.x(), gridLayout_->columnCount() - 1), qMin(lastPos.y(), gridLayout_->rowCount() - 1));
 
     QLayoutItem* item = gridLayout_->itemAtPosition(lastPos.y(), lastPos.x());
     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;
     for (int y = 0; y < gridLayout_->rowCount(); y++) {
         for (int x = 0; x < gridLayout_->columnCount(); x++) {
             QLayoutItem* layoutItem = gridLayout_->itemAtPosition(y, x);
             QtTabWidget* tabWidget = dynamic_cast<QtTabWidget*>(layoutItem->widget());
@@ -322,18 +325,36 @@ void QtDynamicGridLayout::setDimensions(const QSize& dim) {
     setUpdatesEnabled(true);
     delete layout();
     setLayout(newLayout);
     gridLayout_ = newLayout;
 
     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();
 
     for (int y = 0; y < gridLayout_->rowCount(); y++) {
         for (int x = 0; x < gridLayout_->columnCount(); x++) {
             QLayoutItem* layoutItem = gridLayout_->itemAtPosition(y, x);
             QtTabWidget* tabWidget = dynamic_cast<QtTabWidget*>(layoutItem->widget());
diff --git a/Swift/QtUI/Trellis/QtDynamicGridLayout.h b/Swift/QtUI/Trellis/QtDynamicGridLayout.h
index 682ae41..f3a2e96 100644
--- a/Swift/QtUI/Trellis/QtDynamicGridLayout.h
+++ b/Swift/QtUI/Trellis/QtDynamicGridLayout.h
@@ -14,19 +14,19 @@
 #include <QWidget>
 
 namespace Swift {
     class QtTabbable;
     class QtTabWidget;
 
     class QtDynamicGridLayout : public QWidget {
         Q_OBJECT
     public:
-        explicit QtDynamicGridLayout(QWidget* parent = nullptr, bool enableDND = false);
+        explicit QtDynamicGridLayout(bool future, QWidget* parent = nullptr, bool enableDND = false);
         virtual ~QtDynamicGridLayout();
 
         QSize getDimension() const;
 
         // emulate QtTabWidget API
         int addTab(QtTabbable* tab, const QString& title);
         void removeTab(int index);
         int count() const;
 
@@ -65,18 +65,20 @@ namespace Swift {
     private slots:
         void handleTabCloseRequested(int index);
         void handleTabCurrentChanged(int index);
         void handleApplicationFocusChanged(QWidget* oldFocus, QWidget* newFocus);
 
     private:
         void moveTab(QtTabWidget* tabWidget, int oldIndex, int newIndex);
         QtTabWidget* createDNDTabWidget(QWidget* parent);
         void updateEmphasiseFocusOnTabs();
+        void showHideFirstTabs();
 
     private:
         QGridLayout *gridLayout_;
         bool dndEnabled_;
         QHash<QString, QPoint> tabPositions_;
         QtTabbable* movingTab_;
         bool resizing_ = false;
+        bool future_ = false;
     };
 }
diff --git a/Swift/QtUI/Trellis/QtGridSelectionDialog.cpp b/Swift/QtUI/Trellis/QtGridSelectionDialog.cpp
index 0533edf..e922e07 100644
--- a/Swift/QtUI/Trellis/QtGridSelectionDialog.cpp
+++ b/Swift/QtUI/Trellis/QtGridSelectionDialog.cpp
@@ -1,11 +1,11 @@
 /*
- * Copyright (c) 2014-2016 Isode Limited.
+ * Copyright (c) 2014-2018 Isode Limited.
  * All rights reserved.
  * See the COPYING file for more information.
  */
 
 #include <Swift/QtUI/Trellis/QtGridSelectionDialog.h>
 
 #include <QApplication>
 #include <QCursor>
 #include <QPaintEvent>
@@ -70,19 +70,19 @@ QSize QtGridSelectionDialog::getFrameSize() const {
 
 int QtGridSelectionDialog::getDescriptionTextHeight() const {
     auto width = horizontalMargin + frameSize.width() + (padding + frameSize.width()) * (currentGridSize.width() - 1) + horizontalMargin;
     return getDescriptionTextHeight(width);
 }
 
 int QtGridSelectionDialog::getDescriptionTextHeight(int width) const {
     // Height of descriptive centered text below trellis
     auto fontMetrics = QFontMetrics(QApplication::font());
-    auto descriptionBB = fontMetrics.boundingRect(QRect(0, 0, width - 2 * horizontalMargin, 1000), Qt::TextWordWrap, descriptionText, 0, 0);
+    auto descriptionBB = fontMetrics.boundingRect(QRect(0, 0, width - 2 * horizontalMargin, 1000), Qt::TextWordWrap, descriptionText, 0, nullptr);
 
     return (descriptionBB.height() + descriptionBB.y());
 }
 
 void QtGridSelectionDialog::keyReleaseEvent(QKeyEvent* event) {
     if (event) {
         QSize newGridSize = currentGridSize;
         if (event->key() == Qt::Key_Up) {
             newGridSize += QSize(0, -1);
@@ -130,19 +130,19 @@ void QtGridSelectionDialog::paintEvent(QPaintEvent*) {
             int xPos = horizontalMargin + (x * (frameSize.width() + padding));
             int yPos = verticalMargin + (y * (frameSize.height() + padding));
             gridCell.moveTo(QPoint(xPos, yPos));
             painter.drawRect(gridCell);
         }
     }
 
     // draw description text
     auto fontMetrics = QFontMetrics(QApplication::font());
-    auto descriptionBB = fontMetrics.boundingRect(QRect(0,0, width() - 2 * horizontalMargin,0), Qt::AlignHCenter | Qt::AlignTop | Qt::TextWordWrap, descriptionText, 0, 0);
+    auto descriptionBB = fontMetrics.boundingRect(QRect(0,0, width() - 2 * horizontalMargin,0), Qt::AlignHCenter | Qt::AlignTop | Qt::TextWordWrap, descriptionText, 0, nullptr);
 
     QStyleOption opt;
     opt.initFrom(this);
     int textY = verticalMargin + (currentGridSize.height() * (frameSize.height() + padding));
     int textX = (size().width() - descriptionBB.width()) / 2;
     style()->drawItemText(&painter, QRect(textX, textY, descriptionBB.width(), descriptionBB.height()), Qt::AlignHCenter | Qt::AlignTop | Qt::TextWordWrap, opt.palette, true, descriptionText, foregroundRole());
 }
 
 void QtGridSelectionDialog::showEvent(QShowEvent*) {