@@ -42,40 +42,46 @@ Item {
4242 signal longtap()
4343 signal released()
4444
45− UbuntuShape {
45+ Item {
4646 id: iconItem
47− color: Qt.rgba(0, 0, 1, 0.5)
4847 width: parent.width
4948 height: parent.height
5049 anchors.centerIn: parent
51− radius: "medium"
5250
53− image: Image {
54− id: iconImage
55− source: "../graphics/applicationIcons/" + root.iconName + ".png"
56− }
57−
58− MouseArea {
59− id: mouseArea
60− anchors.fill: parent
61− onClicked: root.clicked()
62− onCanceled: root.released()
63− preventStealing: false
51+ UbuntuShape {
52+ color: Qt.rgba(0, 0, 1, 0.5)
53+ width: parent.width - units.gu(1)
54+ height: parent.height - units.gu(1)
55+ anchors.centerIn: parent
56+ radius: "medium"
6457
65− onPressAndHold: {
66− root.state = "moving"
58+ image: Image {
59+ id: iconImage
60+ source: "../graphics/applicationIcons/" + root.iconName + ".png"
6761 }
68− onReleased: {
69− root.state = "docked"
62+
63+ MouseArea {
64+ id: mouseArea
65+ anchors.fill: parent
66+ onClicked: root.clicked()
67+ onCanceled: root.released()
68+ preventStealing: false
69+
70+ onPressAndHold: {
71+ root.state = "moving"
72+ }
73+ onReleased: {
74+ root.state = "docked"
75+ }
7076 }
71− }
7277
78+ }
7379 BorderImage {
7480 id: overlayHighlight
7581 anchors.centerIn: iconItem
7682 rotation: inverted ? 180 : 0
7783 source: root.highlighted || mouseArea.pressed ? "graphics/selected.sci" : "graphics/non-selected.sci"
78− width: iconItem.width + units.gu(1.5)
84+ width: root.width + units.gu(0.5)
7985 height: width
8086 }
8187 }
@@ -209,7 +215,7 @@ Item {
209215 if (index == 0 || index == iconRepeater.count-1) {
210216 if (priv.distanceFromEdge < 0) {
211217 // Fade from 1 to 0 in the distance of 2 items height (which is when the next item reaches the edge)
212− return 1.0 - (-priv.distanceFromEdge / (priv.totalUnfoldedHeight * 2))
218+ return 1.0 - (-priv.distanceFromEdge / (priv.foldingAreaHeight * 3))
213219 }
214220 return 1; // Don't make first/last item transparent as long as inside the view
215221 }