feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

CMake: Show more variables in config widget

Browse Source 
By reducing the height of the editors for the items. At least shows 10
instead of 9 items in the same space on macOS now, and looks less
wasteful.

Change-Id: I422a772cad52a2fcc8223d188b32d8d8adf9bf95
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
This commit is contained in:
Eike Ziller
2022-01-07 16:05:41 +01:00
parent 6893721471
commit 6a5fccd676
2 changed files with 18 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/plugins/cmakeprojectmanager/configmodelitemdelegate.cpp
View File

@@ -47,6 +47,7 @@ QWidget *ConfigModelItemDelegate::createEditor(QWidget *parent, const QStyleOpti
ConfigModel::DataItem data = ConfigModel::dataItemFromIndex(index);
if (data.type == ConfigModel::DataItem::FILE || data.type == ConfigModel::DataItem::DIRECTORY) {
auto edit = new Utils::PathChooser(parent);
edit->setAttribute(Qt::WA_MacSmallSize);
edit->setFocusPolicy(Qt::StrongFocus);
edit->setBaseDirectory(m_base);
edit->setAutoFillBackground(true);
@@ -60,6 +61,7 @@ QWidget *ConfigModelItemDelegate::createEditor(QWidget *parent, const QStyleOpti
return edit;
} else if (!data.values.isEmpty()) {
auto edit = new QComboBox(parent);
edit->setAttribute(Qt::WA_MacSmallSize);
edit->setFocusPolicy(Qt::StrongFocus);
for (const QString &s : qAsConst(data.values))
edit->addItem(s);
@@ -132,9 +134,24 @@ void ConfigModelItemDelegate::setModelData(QWidget *editor, QAbstractItemModel *
QSize CMakeProjectManager::ConfigModelItemDelegate::sizeHint(const QStyleOptionViewItem &option,
const QModelIndex &index) const
{
static int height = -1;
if (height < 0) {
const auto setMaxSize = [](const QWidget &w) {
if (w.sizeHint().height() > height)
height = w.sizeHint().height();
};
QComboBox box;
box.setAttribute(Qt::WA_MacSmallSize);
QCheckBox check;
setMaxSize(box);
setMaxSize(check);
// Do not take the path chooser into consideration, because that would make the height
// larger on Windows, leading to less items displayed, and the size of PathChooser looks
// "fine enough" as is.
}
Q_UNUSED(option)
Q_UNUSED(index)
return QSize(100, m_measurement.sizeHint().height());
return QSize(100, height);
}
} // namespace CMakeProjectManager