From 33ab897c91e609e537b94ee22ff493a797426428 Mon Sep 17 00:00:00 2001
From: Eberhard Graether <egraether@gmail.com>
Date: Wed, 24 Feb 2016 00:02:17 +0100
Subject: [PATCH] ui: fixed squashed Combobox and pick both files and
 directories in QtDirectoryListBox

---
 bin/app/data/gui/project_wizzard/window.css   |  5 +++++
 bin/app/data/gui/setting_window/listbox.css   |  2 +-
 src/lib_gui/qt/element/QtDirectoryListBox.cpp |  1 -
 .../QtProjectWizzardWindow.cpp                | 22 ++++++++++---------
 4 files changed, 18 insertions(+), 12 deletions(-)

diff --git a/bin/app/data/gui/project_wizzard/window.css b/bin/app/data/gui/project_wizzard/window.css
index d51fd45c..03690ec7 100644
--- a/bin/app/data/gui/project_wizzard/window.css
+++ b/bin/app/data/gui/project_wizzard/window.css
@@ -32,6 +32,11 @@
 #formArea {
 	background: white;
 	border: none;
+}
+
+#scrollArea {
+	background: white;
+	border: none;
 	border-top: 1px solid lightgrey;
 	border-bottom: 1px solid lightgrey;
 }
diff --git a/bin/app/data/gui/setting_window/listbox.css b/bin/app/data/gui/setting_window/listbox.css
index 1731664a..42df6ce4 100644
--- a/bin/app/data/gui/setting_window/listbox.css
+++ b/bin/app/data/gui/setting_window/listbox.css
@@ -71,5 +71,5 @@ QtListItemWidget #field {
 }
 
 #dropInfo {
-	color: lightgray;
+	color: #999;
 }
diff --git a/src/lib_gui/qt/element/QtDirectoryListBox.cpp b/src/lib_gui/qt/element/QtDirectoryListBox.cpp
index 9f93f8bd..0670cd14 100644
--- a/src/lib_gui/qt/element/QtDirectoryListBox.cpp
+++ b/src/lib_gui/qt/element/QtDirectoryListBox.cpp
@@ -56,7 +56,6 @@ void QtListItemWidget::setFocus()
 void QtListItemWidget::handleButtonPress()
 {
 	QFileDialog dialog(this);
-	dialog.setFileMode(QFileDialog::Directory);
 
 	if (m_data->text().size())
 	{
diff --git a/src/lib_gui/qt/window/project_wizzard/QtProjectWizzardWindow.cpp b/src/lib_gui/qt/window/project_wizzard/QtProjectWizzardWindow.cpp
index 3fa468b9..0dd79ec3 100644
--- a/src/lib_gui/qt/window/project_wizzard/QtProjectWizzardWindow.cpp
+++ b/src/lib_gui/qt/window/project_wizzard/QtProjectWizzardWindow.cpp
@@ -45,20 +45,22 @@ void QtProjectWizzardWindow::setup()
 
 	populateWindow(contentWidget);
 
-	if (m_scrollAble)
-	{
-		QScrollArea* scrollArea = new QScrollArea();
-		scrollArea->setObjectName("formArea");
-		scrollArea->setFrameShadow(QFrame::Plain);
-		scrollArea->setWidgetResizable(true);
+	QScrollArea* scrollArea = new QScrollArea();
+	scrollArea->setFrameShadow(QFrame::Plain);
+	scrollArea->setObjectName("formArea");
+	scrollArea->setWidgetResizable(true);
 
-		scrollArea->setWidget(contentWidget);
-		windowLayout->addWidget(scrollArea);
+	scrollArea->setWidget(contentWidget);
+	windowLayout->addWidget(scrollArea);
+
+	if (!m_scrollAble)
+	{
+		scrollArea->setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
+		scrollArea->setVerticalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
 	}
 	else
 	{
-		windowLayout->addWidget(contentWidget);
-		windowLayout->setStretchFactor(contentWidget, 1);
+		scrollArea->setObjectName("scrollArea");
 	}
 
 	showButtons(windowLayout);