From e0fc5268fe308d8f60ee96bb2c03c49a5fa4a524 Mon Sep 17 00:00:00 2001 From: Sebastian Kügler Date: Sun, 29 Nov 2015 22:12:49 +0100 Subject: Sync with mobilecomponents 54e4f2622a MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This fixes loading the icon. Signed-off-by: Sebastian Kügler --- qt-mobile/qml/mobilecomponents/Icon.qml | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'qt-mobile/qml/mobilecomponents') diff --git a/qt-mobile/qml/mobilecomponents/Icon.qml b/qt-mobile/qml/mobilecomponents/Icon.qml index d5b253235..b28624dbf 100644 --- a/qt-mobile/qml/mobilecomponents/Icon.qml +++ b/qt-mobile/qml/mobilecomponents/Icon.qml @@ -19,6 +19,7 @@ import QtQuick 2.0 import QtGraphicalEffects 1.0 +import org.kde.plasma.mobilecomponents 0.2 Item { id: root @@ -26,13 +27,13 @@ Item { property alias smooth: image.smooth property bool active: false property bool valid: image.status == Image.Ready - implicitWidth: image.sourceSize.width - implicitHeight: image.sourceSize.height + implicitWidth: Math.min(image.sourceSize.width, Units.iconSizes.medium) + implicitHeight: Math.min(image.sourceSize.height, Units.iconSizes.medium) Image { id: image anchors.fill: parent - source: root.source != "" ? "icons/" + root.source + ".svg" : root.source + source: root.source != "" ? (root.source.indexOf(".") === -1 ? "icons/" + root.source + ".svg" : root.source) : root.source } GammaAdjust { anchors.fill: image -- cgit v1.2.3-70-g09d2