From 9d8c368828aa42b7f05116d2fcd7ac78c0a8ba69 Mon Sep 17 00:00:00 2001
From: Arttu Tarkiainen <arttu.tarkiainen@qt.io>
Date: Thu, 28 Mar 2019 12:30:30 +0200
Subject: Fix long description texts not properly shown by enabling scrolling

Task-number: QTIFW-1308
Change-Id: I9b20d4a4c4e169bb6b523bbf53da6fb5053ae578
Reviewed-by: Janne Anttila <janne.anttila@qt.io>
Reviewed-by: Katja Marttila <katja.marttila@qt.io>
---
 src/libs/installer/componentselectionpage_p.cpp | 12 +++++++++---
 src/libs/installer/componentselectionpage_p.h   |  2 ++
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/src/libs/installer/componentselectionpage_p.cpp b/src/libs/installer/componentselectionpage_p.cpp
index 4e7acc837..c7ec6e0e5 100644
--- a/src/libs/installer/componentselectionpage_p.cpp
+++ b/src/libs/installer/componentselectionpage_p.cpp
@@ -37,6 +37,7 @@
 
 #include <QTreeView>
 #include <QLabel>
+#include <QScrollArea>
 #include <QPushButton>
 #include <QGroupBox>
 #include <QProgressBar>
@@ -69,17 +70,22 @@ ComponentSelectionPagePrivate::ComponentSelectionPagePrivate(ComponentSelectionP
     m_descriptionVLayout = new QVBoxLayout;
     m_descriptionVLayout->setObjectName(QLatin1String("DescriptionLayout"));
 
+    m_descriptionScrollArea = new QScrollArea(q);
+    m_descriptionScrollArea->setWidgetResizable(true);
+    m_descriptionScrollArea->setFrameShape(QFrame::NoFrame);
+    m_descriptionScrollArea->setObjectName(QLatin1String("DescriptionScrollArea"));
+
     m_descriptionLabel = new QLabel(q);
     m_descriptionLabel->setWordWrap(true);
     m_descriptionLabel->setObjectName(QLatin1String("ComponentDescriptionLabel"));
-    m_descriptionVLayout->addWidget(m_descriptionLabel);
+    m_descriptionLabel->setAlignment(Qt::AlignTop);
+    m_descriptionScrollArea->setWidget(m_descriptionLabel);
+    m_descriptionVLayout->addWidget(m_descriptionScrollArea);
 
     m_sizeLabel = new QLabel(q);
     m_sizeLabel->setWordWrap(true);
     m_sizeLabel->setObjectName(QLatin1String("ComponentSizeLabel"));
     m_descriptionVLayout->addWidget(m_sizeLabel);
-    m_descriptionVLayout->addSpacerItem(new QSpacerItem(1, 1, QSizePolicy::MinimumExpanding,
-        QSizePolicy::MinimumExpanding));
 
     m_treeViewVLayout = new QVBoxLayout;
     m_treeViewVLayout->setObjectName(QLatin1String("TreeviewLayout"));
diff --git a/src/libs/installer/componentselectionpage_p.h b/src/libs/installer/componentselectionpage_p.h
index 9ebec834a..6169a06f5 100644
--- a/src/libs/installer/componentselectionpage_p.h
+++ b/src/libs/installer/componentselectionpage_p.h
@@ -37,6 +37,7 @@
 
 class QTreeView;
 class QLabel;
+class QScrollArea;
 class QPushButton;
 class QGroupBox;
 class QListWidgetItem;
@@ -87,6 +88,7 @@ private:
     PackageManagerCore *m_core;
     QTreeView *m_treeView;
     QLabel *m_sizeLabel;
+    QScrollArea *m_descriptionScrollArea;
     QLabel *m_descriptionLabel;
     QVBoxLayout *m_descriptionVLayout;
     QPushButton *m_checkAll;
-- 
cgit v1.2.3