@@ -31,13 +31,13 @@ Item {
31 property real initialHeight: scaleTo == "height" || scaleTo == "fit" ? height : units.gu(10)
31 property real initialHeight: scaleTo == "height" || scaleTo == "fit" ? height : units.gu(10)
33 property alias sourceSize: image.sourceSize
33 property alias sourceSize: image.sourceSize
34− property alias fillMode: image.fillMode
34+ property alias sourceFillMode: shape.sourceFillMode
35 property alias asynchronous: image.asynchronous
35 property alias asynchronous: image.asynchronous
36 property alias cache: image.cache
36 property alias cache: image.cache
37− property alias horizontalAlignment: image.horizontalAlignment
37+ property alias sourceHorizontalAlignment: shape.sourceHorizontalAlignment
38− property alias verticalAlignment: image.verticalAlignment
38+ property alias sourceVerticalAlignment: shape.sourceVerticalAlignment
39 property alias sourceImage: image
39 property alias sourceImage: image
40− property alias borderSource: shape.borderSource
40+ property bool pressed: false
42 state: "default"
42 state: "default"
@@ -78,7 +78,7 @@ Item {
81− UbuntuShape {
81+ UbuntuShapeOverlay {
83 objectName: "shape"
83 objectName: "shape"
84 height: root.initialHeight
84 height: root.initialHeight
@@ -87,7 +87,9 @@ Item {
88 opacity: 0
88 opacity: 0
89 visible: opacity != 0
89 visible: opacity != 0
90+ overlayColor: Qt.rgba(0, 0, 0, root.pressed ? 0.1 : 0)
91+ overlayRect: Qt.rect(0.0, 0.0, 1.0, 1.0)
90− sourceFillMode: UbuntuShape.PreserveAspectFit
92+ sourceFillMode: UbuntuShape.PreserveAspectCrop
91 sourceHorizontalAlignment: UbuntuShape.AlignHCenter
93 sourceHorizontalAlignment: UbuntuShape.AlignHCenter
92 sourceVerticalAlignment: UbuntuShape.AlignVCenter
94 sourceVerticalAlignment: UbuntuShape.AlignVCenter
93 source: Image {
95 source: Image {