Properly scale images

modules/Material/Icon.qml

@@ -35,7 +35,7 @@ Item {
 
     /*!
        The name of the icon to display.
-       
+
        \sa source
     */
     property string name
@@ -64,7 +64,8 @@ Item {
         id: image
 
         visible: !colorize
-
+        sourceSize.width: size
+        sourceSize.height: size
         source: icon.source
     }
 
@@ -77,5 +78,5 @@ Item {
         cached: true
         visible: image.source != "" && colorize
         opacity: icon.color.a
-    }  
+    }
 }

plugins/materialiconprovider.cpp

@@ -22,25 +22,38 @@
 #include <qquickimageprovider.h>
 #include <QImage>
 #include <QPainter>
+#include <QSvgRenderer>
+
+#include <QDebug>
 
 class MaterialIconProvider : public QQuickImageProvider
 {
 public:
     MaterialIconProvider()
-        : QQuickImageProvider(QQuickImageProvider::Pixmap)
+        : QQuickImageProvider(QQuickImageProvider::Image)
     {
     }
 
-    QPixmap requestPixmap(const QString &id, QSize *size, const QSize &requestedSize)
+    QImage requestImage(const QString &id, QSize *size, const QSize &requestedSize)
     {
-        int width = 100;
-        int height = 50;
-        QImage icon = QImage("/lib/qt/qml/Material/icons/" + id + ".svg");
+        QString iconPath = "/lib/qt/qml/Material/icons/" + id + ".svg";
+
+        QSvgRenderer renderer;
+        if (!renderer.load(iconPath))
+            qWarning() << "Unable to load image:" << iconPath;
+
+        QImage image(requestedSize.width() > 0 ? requestedSize.width() : renderer.defaultSize().width(),
+                     requestedSize.height() > 0 ? requestedSize.height() : renderer.defaultSize().height(),
+                     QImage::Format_ARGB32_Premultiplied);
+        image.fill(Qt::transparent);
 
         if (size)
-            *size = QSize(width, height);
+            *size = image.size();
+
+        QPainter p(&image);
+        renderer.render(&p);
 
-        return QPixmap::fromImage(icon);
+        return image;
     }
 };
 

plugins/plugins.pro

@@ -1,6 +1,6 @@
 TEMPLATE = lib
 CONFIG += plugin
-QT += qml quick
+QT += qml quick svg
 
 TARGET  = materialiconprovider