Merge lp:~osomon/unity-2d/jagged-edges into lp:unity-2d/3.0

Proposed by Olivier Tilloy
Status: Merged
Approved by: Florian Boucault
Approved revision: 512
Merged at revision: 513
Proposed branch: lp:~osomon/unity-2d/jagged-edges
Merge into: lp:unity-2d/3.0
Diff against target: 95 lines (+12/-0)
1 file modified
launcher/LauncherItem.qml (+12/-0)
To merge this branch: bzr merge lp:~osomon/unity-2d/jagged-edges
Reviewer Review Type Date Requested Status
Florian Boucault (community) Approve
Review via email: mp+56529@code.launchpad.net

Commit message

[launcher] Smooth animation when tiles are wiggling.

To post a comment you must log in.
Revision history for this message
Florian Boucault (fboucault) wrote :

Good to go.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'launcher/LauncherItem.qml'
2--- launcher/LauncherItem.qml 2011-04-05 12:01:18 +0000
3+++ launcher/LauncherItem.qml 2011-04-06 09:41:15 +0000
4@@ -173,6 +173,7 @@
5 id: tileBackground
6 property color color: defaultBackgroundColor
7 anchors.fill: parent
8+ smooth: true
9
10 SequentialAnimation on opacity {
11 NumberAnimation { to: 0.0; duration: 1000; easing.type: Easing.InOutQuad }
12@@ -199,6 +200,7 @@
13 Image {
14 id: tileOutline
15 anchors.fill: parent
16+ smooth: true
17
18 sourceSize.width: item.tileSize
19 sourceSize.height: item.tileSize
20@@ -220,6 +222,7 @@
21 Image {
22 id: icon
23 anchors.centerIn: parent
24+ smooth: true
25
26 sourceSize.width: 48
27 sourceSize.height: 48
28@@ -242,6 +245,7 @@
29 Image {
30 id: tileShine
31 anchors.fill: parent
32+ smooth: true
33
34 source: "artwork/round_shine_54x54.png"
35 sourceSize.width: item.tileSize
36@@ -251,6 +255,7 @@
37 Image {
38 id: selectionOutline
39 anchors.centerIn: parent
40+ smooth: true
41 source: "artwork/round_selected_66x66.png"
42 visible: launcherView.focus && item.activeFocus
43 }
44@@ -263,6 +268,7 @@
45 y: 1
46 x: 1
47 radius: height / 2 - 1
48+ smooth: true
49 border.width: 2
50 border.color: "white"
51 color: "#595959"
52@@ -272,6 +278,7 @@
53 anchors.centerIn: parent
54 font.pixelSize: parent.height - 3
55 width: parent.width - 5
56+ smooth: true
57 elide: Text.ElideRight
58 horizontalAlignment: Text.AlignHCenter
59 color: "white"
60@@ -285,6 +292,7 @@
61 anchors.verticalCenter: parent.verticalCenter
62 anchors.left: parent.left
63 width: tile.width
64+ smooth: true
65 state: launcherItem.progressBarVisible ? "" : "hidden"
66
67 Image {
68@@ -293,6 +301,7 @@
69 anchors.verticalCenter: parent.verticalCenter
70 x: 6
71 width: sourceSize.width * launcherItem.progress
72+ smooth: true
73
74 Behavior on width {
75 NumberAnimation { duration: 200; easing.type: Easing.InOutSine }
76@@ -326,11 +335,13 @@
77 radius: 2
78 width: 22
79 height: 22
80+ smooth: true
81
82 Text {
83 id: shortcutText
84 anchors.centerIn: parent
85 color: "white"
86+ smooth: true
87 }
88 }
89
90@@ -339,6 +350,7 @@
91 anchors.left: parent.left
92 anchors.top: parent.top
93 visible: launcherItem.emblemVisible && !counter.visible
94+ smooth: true
95 }
96
97

Subscribers

People subscribed via source and target branches