diff options
| author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2018-09-07 12:42:16 +0200 |
|---|---|---|
| committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2018-09-21 11:49:43 +0000 |
| commit | 9632cb5f028cafb6616ddb6bca32c8b624e91e5c (patch) | |
| tree | 1b1b555785b368f80d869b4cb061ee60c18078cd /src/designer | |
| parent | 0e48dff881f8f2eda07dc07057e12cf0fbdda062 (diff) | |
Qt Designer: Make font point size combo in Device Profile dialog editable
The box was populated using QFontDatabase::standardSizes(), which
varies by platform.
Task-number: QTBUG-70430
Change-Id: Ie19359bea1e517af206e0d0dfc770668566b4fa0
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
Diffstat (limited to 'src/designer')
| -rw-r--r-- | src/designer/src/components/formeditor/deviceprofiledialog.cpp | 7 | ||||
| -rw-r--r-- | src/designer/src/components/formeditor/deviceprofiledialog.ui | 6 |
2 files changed, 11 insertions, 2 deletions
diff --git a/src/designer/src/components/formeditor/deviceprofiledialog.cpp b/src/designer/src/components/formeditor/deviceprofiledialog.cpp index 6c3eff2a6..40a9e6ab6 100644 --- a/src/designer/src/components/formeditor/deviceprofiledialog.cpp +++ b/src/designer/src/components/formeditor/deviceprofiledialog.cpp @@ -37,6 +37,7 @@ #include <QtWidgets/qpushbutton.h> #include <QtWidgets/qstylefactory.h> #include <QtGui/qfontdatabase.h> +#include <QtGui/qvalidator.h> #include <QtCore/qfileinfo.h> #include <QtCore/qfile.h> @@ -55,7 +56,6 @@ template <class IntIterator> static void populateNumericCombo(IntIterator i1, IntIterator i2, QComboBox *cb) { QString s; - cb->setEditable(false); for ( ; i1 != i2 ; ++i1) { const int n = *i1; s.setNum(n); @@ -76,6 +76,11 @@ DeviceProfileDialog::DeviceProfileDialog(QDesignerDialogGuiInterface *dlgGui, QW const QList<int> standardFontSizes = QFontDatabase::standardSizes(); populateNumericCombo(standardFontSizes.constBegin(), standardFontSizes.constEnd(), m_ui->m_systemFontSizeCombo); + // 288pt observed on macOS. + const int maxPointSize = qMax(288, standardFontSizes.constLast()); + m_ui->m_systemFontSizeCombo->setValidator(new QIntValidator(1, maxPointSize, + m_ui->m_systemFontSizeCombo)); + // Styles const QStringList styles = QStyleFactory::keys(); m_ui->m_styleCombo->addItem(tr("Default"), QVariant(QString())); diff --git a/src/designer/src/components/formeditor/deviceprofiledialog.ui b/src/designer/src/components/formeditor/deviceprofiledialog.ui index d7a298c67..2915eb996 100644 --- a/src/designer/src/components/formeditor/deviceprofiledialog.ui +++ b/src/designer/src/components/formeditor/deviceprofiledialog.ui @@ -38,7 +38,11 @@ </widget> </item> <item row="2" column="1"> - <widget class="QComboBox" name="m_systemFontSizeCombo"/> + <widget class="QComboBox" name="m_systemFontSizeCombo"> + <property name="editable"> + <bool>true</bool> + </property> + </widget> </item> <item row="3" column="0"> <widget class="QLabel" name="m_styleLabel"> |