diff --git a/declarativeimports/core/corebindingsplugin.cpp b/declarativeimports/core/corebindingsplugin.cpp index 44b5efd78..c4ab894c9 100644 --- a/declarativeimports/core/corebindingsplugin.cpp +++ b/declarativeimports/core/corebindingsplugin.cpp @@ -39,7 +39,7 @@ #include "svgitem.h" // #include "theme.h" // #include "dialog.h" -// #include "iconitem.h" +#include "iconitem.h" // #include "tooltip.h" // #include "dataenginebindings_p.h" @@ -99,7 +99,7 @@ void CoreBindingsPlugin::registerTypes(const char *uri) // qRegisterMetaType("QueryMatch"); // // qmlRegisterType(); -// qmlRegisterType(uri, 0, 1, "IconItem"); + qmlRegisterType(uri, 0, 1, "IconItem"); /*qmlRegisterInterface("DataSource"); qRegisterMetaType("DataSource");*/ diff --git a/declarativeimports/core/iconitem.cpp b/declarativeimports/core/iconitem.cpp index c7cf6a89d..5f5b47770 100644 --- a/declarativeimports/core/iconitem.cpp +++ b/declarativeimports/core/iconitem.cpp @@ -27,8 +27,10 @@ #include #include +#include + IconItem::IconItem(QQuickItem *parent) - : QQuickItem(parent), + : QQuickPaintedItem(parent), m_svgIcon(0), m_smooth(false), m_active(false), @@ -207,14 +209,21 @@ bool IconItem::isValid() const void IconItem::paint(QPainter *painter) { if (m_iconPixmaps.isEmpty()) { + qDebug() << "XXXXXXXXXX icons pixmap empty"; return; } + foreach (QPixmap pix, m_iconPixmaps) { + qDebug() << "pixmap: " << pix.size(); + } + painter->save(); painter->setRenderHint(QPainter::Antialiasing, m_smooth); painter->setRenderHint(QPainter::SmoothPixmapTransform, m_smooth); const QRect destRect(QPointF(boundingRect().center() - QPointF(m_iconPixmaps.first().width()/2, m_iconPixmaps.first().height()/2)).toPoint(), m_iconPixmaps.first().size()); + //QSize(32,32)); + qDebug() << "XXXXXXXXXX icons pixmap THERE" << destRect; if (m_animation->state() == QAbstractAnimation::Running) { QPixmap result = m_iconPixmaps.first(); @@ -266,8 +275,6 @@ void IconItem::loadPixmap() //if size is more than 64, leave as is } - - //final pixmap to paint QPixmap result; if (m_svgIcon) { diff --git a/declarativeimports/core/iconitem.h b/declarativeimports/core/iconitem.h index 1078e04c9..7c2cb00c6 100644 --- a/declarativeimports/core/iconitem.h +++ b/declarativeimports/core/iconitem.h @@ -21,7 +21,7 @@ #define ICONITEM_H #include -#include +#include #include #include @@ -31,7 +31,7 @@ namespace Plasma { class Svg; } -class IconItem : public QQuickItem +class IconItem : public QQuickPaintedItem { Q_OBJECT