From a1fbfb5513e6bbfeb1ba7b1686e9ce5034167382 Mon Sep 17 00:00:00 2001 From: Eike Ziller Date: Tue, 18 Dec 2018 12:14:50 +0100 Subject: [PATCH] Kit Preferences: Avoid possibly huge horizontal detail widget size The preferred size of combo boxes can depend on the contents, so if there were large items in e.g. the tool chain or debugger drop downs, the horizontal size of the kit details was getting very big. So ignore the preferred size of combo boxes. Change-Id: Ic59afd6ce73c491e7df46d1159dfea58e978dad1 Reviewed-by: hjk --- src/plugins/cmakeprojectmanager/cmakekitconfigwidget.cpp | 1 + src/plugins/debugger/debuggerkitconfigwidget.cpp | 1 + src/plugins/projectexplorer/kitinformationconfigwidget.cpp | 2 ++ src/plugins/qtsupport/qtkitconfigwidget.cpp | 1 + 4 files changed, 5 insertions(+) diff --git a/src/plugins/cmakeprojectmanager/cmakekitconfigwidget.cpp b/src/plugins/cmakeprojectmanager/cmakekitconfigwidget.cpp index 47eeef30a80..7802863770e 100644 --- a/src/plugins/cmakeprojectmanager/cmakekitconfigwidget.cpp +++ b/src/plugins/cmakeprojectmanager/cmakekitconfigwidget.cpp @@ -63,6 +63,7 @@ CMakeKitConfigWidget::CMakeKitConfigWidget(Kit *kit, m_comboBox(new QComboBox), m_manageButton(new QPushButton(KitConfigWidget::msgManage())) { + m_comboBox->setSizePolicy(QSizePolicy::Ignored, m_comboBox->sizePolicy().verticalPolicy()); m_comboBox->setEnabled(false); m_comboBox->setToolTip(toolTip()); diff --git a/src/plugins/debugger/debuggerkitconfigwidget.cpp b/src/plugins/debugger/debuggerkitconfigwidget.cpp index 241770c4377..1486e7a08cf 100644 --- a/src/plugins/debugger/debuggerkitconfigwidget.cpp +++ b/src/plugins/debugger/debuggerkitconfigwidget.cpp @@ -67,6 +67,7 @@ DebuggerKitConfigWidget::DebuggerKitConfigWidget(Kit *workingCopy, const KitInfo : KitConfigWidget(workingCopy, ki) { m_comboBox = new QComboBox; + m_comboBox->setSizePolicy(QSizePolicy::Ignored, m_comboBox->sizePolicy().verticalPolicy()); m_comboBox->setEnabled(true); refresh(); diff --git a/src/plugins/projectexplorer/kitinformationconfigwidget.cpp b/src/plugins/projectexplorer/kitinformationconfigwidget.cpp index c6fafe74699..624c7a099b9 100644 --- a/src/plugins/projectexplorer/kitinformationconfigwidget.cpp +++ b/src/plugins/projectexplorer/kitinformationconfigwidget.cpp @@ -150,6 +150,7 @@ ToolChainInformationConfigWidget::ToolChainInformationConfigWidget(Kit *k, const foreach (Core::Id l, languageList) { layout->addWidget(new QLabel(ToolChainManager::displayNameOfLanguageId(l) + ':'), row, 0); auto cb = new QComboBox; + cb->setSizePolicy(QSizePolicy::Ignored, cb->sizePolicy().verticalPolicy()); cb->setToolTip(toolTip()); m_languageComboboxMap.insert(l, cb); @@ -327,6 +328,7 @@ DeviceInformationConfigWidget::DeviceInformationConfigWidget(Kit *workingCopy, c m_comboBox(new QComboBox), m_model(new DeviceManagerModel(DeviceManager::instance())) { + m_comboBox->setSizePolicy(QSizePolicy::Ignored, m_comboBox->sizePolicy().verticalPolicy()); m_comboBox->setModel(m_model); m_manageButton = new QPushButton(KitConfigWidget::msgManage()); diff --git a/src/plugins/qtsupport/qtkitconfigwidget.cpp b/src/plugins/qtsupport/qtkitconfigwidget.cpp index d9dfca08fc4..53c6421038c 100644 --- a/src/plugins/qtsupport/qtkitconfigwidget.cpp +++ b/src/plugins/qtsupport/qtkitconfigwidget.cpp @@ -44,6 +44,7 @@ QtKitConfigWidget::QtKitConfigWidget(ProjectExplorer::Kit *k, const ProjectExplo KitConfigWidget(k, ki) { m_combo = new QComboBox; + m_combo->setSizePolicy(QSizePolicy::Ignored, m_combo->sizePolicy().verticalPolicy()); m_combo->addItem(tr("None"), -1); QList versionIds = Utils::transform(QtVersionManager::versions(), &BaseQtVersion::uniqueId);