From d177b0a31d8a4c135a63f23db60fb84ba41adc43 Mon Sep 17 00:00:00 2001 From: Marco Martin Date: Tue, 27 Nov 2012 14:02:34 +0100 Subject: [PATCH] react to enabled changed --- declarativeimports/core/iconitem.cpp | 4 +++- declarativeimports/core/iconitem.h | 3 +-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/declarativeimports/core/iconitem.cpp b/declarativeimports/core/iconitem.cpp index fdd371b4f..b57eafe52 100644 --- a/declarativeimports/core/iconitem.cpp +++ b/declarativeimports/core/iconitem.cpp @@ -53,6 +53,9 @@ IconItem::IconItem(QDeclarativeItem *parent) this, SLOT(implicitHeightChanged())); + connect(this, SIGNAL(enabledChanged()), + this, SLOT(loadPixmap())); + //initialize implicit size to the Dialog size setImplicitWidth(KIconLoader::global()->currentSize(KIconLoader::Dialog)); setImplicitHeight(KIconLoader::global()->currentSize(KIconLoader::Dialog)); @@ -248,7 +251,6 @@ void IconItem::loadPixmap() { int size = qMin(width(), height()); - //FIXME: Heuristic: allow 24x24 for icons/ that are in the systray(ugly) if (m_svgIcon && m_svgIcon->imagePath().contains("icons/") && size > KIconLoader::SizeSmallMedium && diff --git a/declarativeimports/core/iconitem.h b/declarativeimports/core/iconitem.h index 9f0677918..16513b062 100644 --- a/declarativeimports/core/iconitem.h +++ b/declarativeimports/core/iconitem.h @@ -77,12 +77,11 @@ Q_SIGNALS: void implicitHeightChanged(); private Q_SLOTS: + void loadPixmap(); void animationFinished(); void valueChanged(const QVariant &value); private: - void loadPixmap(); - //all the ways we can set an source. Only one of them will be valid QIcon m_icon; Plasma::Svg *m_svgIcon;