From 5f139b81445b4eac84de20d4f20d8b3a46f7bb92 Mon Sep 17 00:00:00 2001 From: Alexander Bock Date: Tue, 27 Jul 2021 14:14:19 +0200 Subject: [PATCH] Tune the look of the asset dialog --- .../ext/launcher/resources/qss/launcher.qss | 1 + .../ext/launcher/src/profile/assetsdialog.cpp | 14 ++++++-------- ext/ghoul | 2 +- 3 files changed, 8 insertions(+), 9 deletions(-) diff --git a/apps/OpenSpace/ext/launcher/resources/qss/launcher.qss b/apps/OpenSpace/ext/launcher/resources/qss/launcher.qss index 032ac15ccc..1b31494beb 100644 --- a/apps/OpenSpace/ext/launcher/resources/qss/launcher.qss +++ b/apps/OpenSpace/ext/launcher/resources/qss/launcher.qss @@ -115,6 +115,7 @@ PropertiesDialog QListWidget { */ AssetsDialog QTreeView { min-width: 40em; + min-height: 40em; } /* diff --git a/apps/OpenSpace/ext/launcher/src/profile/assetsdialog.cpp b/apps/OpenSpace/ext/launcher/src/profile/assetsdialog.cpp index c2573cc381..a89b0c3ba3 100644 --- a/apps/OpenSpace/ext/launcher/src/profile/assetsdialog.cpp +++ b/apps/OpenSpace/ext/launcher/src/profile/assetsdialog.cpp @@ -129,10 +129,7 @@ AssetsDialog::AssetsDialog(openspace::Profile& profile, const std::string& asset { setWindowTitle("Assets"); _assetTreeModel.importModelData(assetBasePath, userAssetBasePath); - createWidgets(); -} -void AssetsDialog::createWidgets() { QBoxLayout* layout = new QVBoxLayout(this); { QLabel* heading = new QLabel("Select assets from /data/assets"); @@ -173,18 +170,19 @@ void AssetsDialog::createWidgets() { nRows, _assetTreeModel.index(-1, 0) ); - layout->addWidget(_assetTree); + layout->addWidget(_assetTree, 4); } { + QWidget* box = new QWidget; + QBoxLayout* boxLayout = new QVBoxLayout(box); QLabel* summaryHeading = new QLabel("Selection summary"); summaryHeading->setObjectName("heading"); - layout->addWidget(summaryHeading); - } - { + boxLayout->addWidget(summaryHeading); _summary = new QTextEdit; _summary->setReadOnly(true); _summary->setText(createTextSummary()); - layout->addWidget(_summary); + boxLayout->addWidget(_summary); + layout->addWidget(box, 1); } layout->addWidget(new Line); diff --git a/ext/ghoul b/ext/ghoul index 0282811937..0a7f66f9a1 160000 --- a/ext/ghoul +++ b/ext/ghoul @@ -1 +1 @@ -Subproject commit 0282811937bc5102ac4dad3a0b53bf72c28aac77 +Subproject commit 0a7f66f9a1cb050b9d6e803257ab1320259fa53d