1 files changed, 10 insertions, 10 deletions
diff --git a/Swift/QtUI/QtChatTabs.cpp b/Swift/QtUI/QtChatTabs.cpp
index f4d0d46..edd0b87 100644
--- a/Swift/QtUI/QtChatTabs.cpp
+++ b/Swift/QtUI/QtChatTabs.cpp
@@ -1,11 +1,11 @@
 /*
- * Copyright (c) 2010-2017 Isode Limited.
+ * Copyright (c) 2010-2018 Isode Limited.
  * All rights reserved.
  * See the COPYING file for more information.
  */
 
 #include <Swift/QtUI/QtChatTabs.h>
 
 #include <algorithm>
 #include <vector>
 
@@ -18,34 +18,35 @@
 #include <QMenu>
 #include <QTabBar>
 #include <QTabWidget>
 #include <QWindow>
 #include <QtGlobal>
 
 #include <Swiften/Base/Log.h>
 
 #include <Swift/Controllers/ChatMessageSummarizer.h>
+#include <Swift/Controllers/SettingConstants.h>
 
 #include <Swift/QtUI/QtSwiftUtil.h>
 #include <Swift/QtUI/QtTabWidget.h>
 #include <Swift/QtUI/QtTabbable.h>
 #include <Swift/QtUI/QtUISettingConstants.h>
 #include <Swift/QtUI/Trellis/QtDynamicGridLayout.h>
 #include <Swift/QtUI/Trellis/QtGridSelectionDialog.h>
 
 namespace Swift {
-QtChatTabs::QtChatTabs(bool singleWindow, SettingsProvider* settingsProvider, bool trellisMode) : QWidget(), singleWindow_(singleWindow), settingsProvider_(settingsProvider), trellisMode_(trellisMode), dynamicGrid_(nullptr), gridSelectionDialog_(nullptr) {
+QtChatTabs::QtChatTabs(SettingsProvider* settingsProvider, bool trellisMode) : QWidget(), settingsProvider_(settingsProvider), trellisMode_(trellisMode), dynamicGrid_(nullptr), gridSelectionDialog_(nullptr) {
 #ifndef Q_OS_MAC
     setWindowIcon(QIcon(":/logo-chat-16.png"));
 #else
     setAttribute(Qt::WA_ShowWithoutActivating);
 #endif
-    dynamicGrid_ = new QtDynamicGridLayout(this, trellisMode);
+    dynamicGrid_ = new QtDynamicGridLayout(settingsProvider->getSetting(SettingConstants::FUTURE), this, trellisMode);
     connect(dynamicGrid_, SIGNAL(tabCloseRequested(int)), this, SLOT(handleTabCloseRequested(int)));
     connect(dynamicGrid_, SIGNAL(onCurrentIndexChanged(int)), this, SLOT(handleCurrentTabIndexChanged(int)));
 
     QVBoxLayout *layout = new QVBoxLayout;
     layout->setSpacing(0);
     layout->setContentsMargins(0, 0, 0, 0);
     layout->addWidget(dynamicGrid_);
     setLayout(layout);
 
@@ -193,25 +194,20 @@ void QtChatTabs::handleWantsToActivate() {
     activateWindow();
 }
 
 void QtChatTabs::handleTabClosing() {
     QWidget* widget = qobject_cast<QWidget*>(sender());
     int index;
     if (widget && ((index = dynamicGrid_->indexOf(widget)) >= 0)) {
         dynamicGrid_->removeTab(index);
         if (dynamicGrid_->count() == 0) {
-            if (!singleWindow_) {
-                hide();
-            }
-            else {
-                setWindowTitle("");
-                onTitleChanged("");
-            }
+            setWindowTitle("");
+            onTitleChanged("");
         }
         else {
             handleTabTitleUpdated(dynamicGrid_->currentWidget());
         }
     }
 }
 
 void QtChatTabs::handleRequestedPreviousTab() {
     int newIndex = dynamicGrid_->currentIndex() - 1;
@@ -419,10 +415,14 @@ void QtChatTabs::checkForFirstShow() {
         show();
         QCoreApplication::processEvents(); /* Run through the eventloop to clear the show() */
         if (currentWindow) {
             currentWindow->activateWindow(); /* Set focus back */
         }
 #endif
     }
 }
 
+QSize QtChatTabs::sizeHint() const {
+    return QSize(600, 600);
+}
+
 }