4 files changed, 10 insertions, 2 deletions
diff --git a/Swift/QtUI/QtChatWindow.cpp b/Swift/QtUI/QtChatWindow.cpp
index e0881d5..231a9b9 100644
--- a/Swift/QtUI/QtChatWindow.cpp
+++ b/Swift/QtUI/QtChatWindow.cpp
@@ -115,2 +115,5 @@ QtChatWindow::QtChatWindow(const QString& contact, QtChatTheme* theme, UIEventSt
     }
+    // When used with QSplitter and setChildrenCollapsible(false), the following prevents
+    // this widget to be hidden, i.e. resized to zero width.
+    messageLog_->setMinimumWidth(20);
     logRosterSplitter_->addWidget(messageLog_);
@@ -358,2 +361,3 @@ void QtChatWindow::handleChangeSplitterState(QByteArray state) {
 #endif
+    logRosterSplitter_->setChildrenCollapsible(false);
 }
diff --git a/Swift/QtUI/QtMainWindow.cpp b/Swift/QtUI/QtMainWindow.cpp
index cd38259..7eec8d1 100644
--- a/Swift/QtUI/QtMainWindow.cpp
+++ b/Swift/QtUI/QtMainWindow.cpp
@@ -80,2 +80,6 @@ QtMainWindow::QtMainWindow(Chattables& chattables, SettingsProvider* settings, U
         tabs_->addTab(overviewScroll, tr("&All"));
+
+        // When used with QSplitter and setChildrenCollapsible(false), the following prevents
+        // this widget to be hidden, i.e. resized to zero width.
+        chatOverview_->setMinimumWidth(20);
     }
diff --git a/Swift/QtUI/QtSingleWindow.cpp b/Swift/QtUI/QtSingleWindow.cpp
index 5956172..2e88968 100644
--- a/Swift/QtUI/QtSingleWindow.cpp
+++ b/Swift/QtUI/QtSingleWindow.cpp
@@ -26,3 +26,3 @@ QtSingleWindow::QtSingleWindow(QtSettingsProvider* settings) : QSplitter() {
     restoreSplitters();
-
+    setChildrenCollapsible(false);
 #ifdef SWIFTEN_PLATFORM_MACOSX
diff --git a/Swift/QtUI/QtWebKitChatView.cpp b/Swift/QtUI/QtWebKitChatView.cpp
index 6a7018e..92f0a2c 100644
--- a/Swift/QtUI/QtWebKitChatView.cpp
+++ b/Swift/QtUI/QtWebKitChatView.cpp
@@ -13,5 +13,5 @@
 #include <QFile>
+#include <QFileDevice>
 #include <QFileDialog>
 #include <QFileInfo>
-#include <QFileDevice>
 #include <QInputDialog>