diff options
| author | Mitch Curtis <mitch.curtis@qt.io> | 2017-05-15 16:09:11 +0200 |
|---|---|---|
| committer | Mitch Curtis <mitch.curtis@qt.io> | 2017-05-15 14:33:13 +0000 |
| commit | 7c52e1d6e318a8874913e484d2f1481f21458c9e (patch) | |
| tree | 6f94f4ac1056723e7dbe0f713ef5c31d4ff5009b /src/quickcontrols2/qquickiconlabel.cpp | |
| parent | 8290b876b6f0673cbaf5119bf737873af4fde928 (diff) | |
QQuickIconLabel: ensure that icon color changes are respected
updateIcon() is no longer called, so we can move its contents into
syncImage(), which is called by updateOrSyncImage(), which is called by
QQuickIconLabel::setIcon().. which is called each time any of the icon
properties change (now that it's a value type).
Task-number: QTBUG-60807
Change-Id: Id1ff875e0855bd76755d49466f82c2eac36ffd09
Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
Diffstat (limited to 'src/quickcontrols2/qquickiconlabel.cpp')
| -rw-r--r-- | src/quickcontrols2/qquickiconlabel.cpp | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/src/quickcontrols2/qquickiconlabel.cpp b/src/quickcontrols2/qquickiconlabel.cpp index 1cfceda2..06d74d43 100644 --- a/src/quickcontrols2/qquickiconlabel.cpp +++ b/src/quickcontrols2/qquickiconlabel.cpp @@ -125,6 +125,8 @@ void QQuickIconLabelPrivate::syncImage() image->setName(icon.name()); image->setSource(icon.source()); + image->setSourceSize(QSize(icon.width(), icon.height())); + image->setColor(icon.color()); } void QQuickIconLabelPrivate::updateOrSyncImage() @@ -196,15 +198,6 @@ void QQuickIconLabelPrivate::updateOrSyncLabel() } } -void QQuickIconLabelPrivate::updateIcon() -{ - if (!image || icon.isEmpty()) - return; - - image->setColor(icon.color()); - image->setSourceSize(QSize(icon.width(), icon.height())); -} - void QQuickIconLabelPrivate::updateImplicitSize() { Q_Q(QQuickIconLabel); |