diff options
| author | Mitch Curtis <mitch.curtis@qt.io> | 2018-11-05 10:46:41 +0100 |
|---|---|---|
| committer | Mitch Curtis <mitch.curtis@qt.io> | 2018-12-03 14:47:19 +0000 |
| commit | bbd6c9972206eccc4d2872be44db509ef716c351 (patch) | |
| tree | 485fbef2f80b9be35695c3b1cc0bca6080fa6d07 /src | |
| parent | 1dff93937db7b3be48fdedbb60449260221dedc0 (diff) | |
Fix QQuickIconLabel's baselineOffset
Set it to the bottom of the text if there is text.
Change-Id: I03e14ec587e0868e1f2104dd464591b243ea9264
Fixes: QTBUG-71554
Reviewed-by: Pierre-Yves Siret <gr3cko@gmail.com>
Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@qt.io>
Diffstat (limited to 'src')
| -rw-r--r-- | src/quickcontrols2/qquickiconlabel.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/quickcontrols2/qquickiconlabel.cpp b/src/quickcontrols2/qquickiconlabel.cpp index 6232b48c..37e6060a 100644 --- a/src/quickcontrols2/qquickiconlabel.cpp +++ b/src/quickcontrols2/qquickiconlabel.cpp @@ -233,6 +233,7 @@ static QRectF alignedRect(bool mirrored, Qt::Alignment alignment, const QSizeF & void QQuickIconLabelPrivate::layout() { + Q_Q(QQuickIconLabel); if (!componentComplete) return; @@ -327,6 +328,8 @@ void QQuickIconLabelPrivate::layout() } break; } + + q->setBaselineOffset(label ? label->y() + label->baselineOffset() : 0); } static const QQuickItemPrivate::ChangeTypes itemChangeTypes = |