diff options
Diffstat (limited to 'framework')
-rw-r--r-- | framework/qml/AttachmentDelegate.qml | 1 | ||||
-rw-r--r-- | framework/qml/Icon.qml | 8 | ||||
-rw-r--r-- | framework/qml/IconButton.qml | 6 |
3 files changed, 6 insertions, 9 deletions
diff --git a/framework/qml/AttachmentDelegate.qml b/framework/qml/AttachmentDelegate.qml index d4e025dc..46cf76f9 100644 --- a/framework/qml/AttachmentDelegate.qml +++ b/framework/qml/AttachmentDelegate.qml | |||
@@ -63,6 +63,7 @@ Item { | |||
63 | width: height | 63 | width: height |
64 | iconName: Kube.Icons.save_inverted | 64 | iconName: Kube.Icons.save_inverted |
65 | onClicked: root.download() | 65 | onClicked: root.download() |
66 | padding: 0 | ||
66 | } | 67 | } |
67 | } | 68 | } |
68 | } | 69 | } |
diff --git a/framework/qml/Icon.qml b/framework/qml/Icon.qml index 6dc9529f..947e69ef 100644 --- a/framework/qml/Icon.qml +++ b/framework/qml/Icon.qml | |||
@@ -22,11 +22,9 @@ Item { | |||
22 | id: root | 22 | id: root |
23 | property string iconName | 23 | property string iconName |
24 | property url iconSource | 24 | property url iconSource |
25 | property alias implicitHeight: image.implicitHeight | ||
26 | property alias implicitWidth: image.implicitWidth | ||
27 | property alias status: image.status | 25 | property alias status: image.status |
28 | width: implicitWidth | 26 | property alias implicitWidth: image.implicitWidth |
29 | height: implicitHeight | 27 | property alias implicitHeight: image.implicitHeight |
30 | 28 | ||
31 | onIconNameChanged: setImageSource() | 29 | onIconNameChanged: setImageSource() |
32 | 30 | ||
@@ -39,7 +37,7 @@ Item { | |||
39 | 37 | ||
40 | Image { | 38 | Image { |
41 | id: image | 39 | id: image |
42 | anchors.centerIn: parent | 40 | anchors.fill: parent |
43 | sourceSize.width: width | 41 | sourceSize.width: width |
44 | sourceSize.height: height | 42 | sourceSize.height: height |
45 | cache: true | 43 | cache: true |
diff --git a/framework/qml/IconButton.qml b/framework/qml/IconButton.qml index a2a9245d..b9b20102 100644 --- a/framework/qml/IconButton.qml +++ b/framework/qml/IconButton.qml | |||
@@ -24,7 +24,7 @@ import org.kube.framework 1.0 as Kube | |||
24 | T.Button { | 24 | T.Button { |
25 | id: root | 25 | id: root |
26 | 26 | ||
27 | property var iconName | 27 | property alias iconName: icon.iconName |
28 | 28 | ||
29 | width: Kube.Units.gridUnit + padding * 2 | 29 | width: Kube.Units.gridUnit + padding * 2 |
30 | height: Kube.Units.gridUnit + padding * 2 | 30 | height: Kube.Units.gridUnit + padding * 2 |
@@ -48,9 +48,7 @@ T.Button { | |||
48 | } | 48 | } |
49 | 49 | ||
50 | contentItem: Kube.Icon { | 50 | contentItem: Kube.Icon { |
51 | width: root.height - Kube.Units.smallSpacing * 2 | 51 | id: icon |
52 | height: width | ||
53 | iconName: root.iconName | ||
54 | } | 52 | } |
55 | } | 53 | } |
56 | 54 | ||