Merge lp:~unity-team/unity/unity.fix-631446-2 into lp:unity

Proposed by Mirco Müller
Status: Merged
Approved by: Gord Allott
Approved revision: no longer in the source branch.
Merged at revision: 522
Proposed branch: lp:~unity-team/unity/unity.fix-631446-2
Merge into: lp:unity
Diff against target: 12 lines (+1/-1)
1 file modified
unity-private/launcher/quicklist-controller.vala (+1/-1)
To merge this branch: bzr merge lp:~unity-team/unity/unity.fix-631446-2
Reviewer Review Type Date Requested Status
Gord Allott (community) Approve
Review via email: mp+36124@code.launchpad.net

Description of the change

Make sure the anchor-position/offset of label and quicklist is really the same. Hopefully fixes LP: #631446 for real now.

To post a comment you must log in.
Revision history for this message
Gord Allott (gordallott) wrote :

fixes the problem here, approved

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'unity-private/launcher/quicklist-controller.vala'
--- unity-private/launcher/quicklist-controller.vala 2010-09-16 22:38:51 +0000
+++ unity-private/launcher/quicklist-controller.vala 2010-09-21 10:42:46 +0000
@@ -271,7 +271,7 @@
271 h = (attached_controller.child as Ctk.Actor).get_height();271 h = (attached_controller.child as Ctk.Actor).get_height();
272 menu.compute_style_textures ();272 menu.compute_style_textures ();
273 menu.set_expansion_size_factor (0.0f);273 menu.set_expansion_size_factor (0.0f);
274 menu.set_anchor_position (x + w - 9, y + h/2.0f, 0);274 menu.set_anchor_position (x + w - 4, y + h/2.0f, 0);
275 menu.animate (Clutter.AnimationMode.LINEAR,275 menu.animate (Clutter.AnimationMode.LINEAR,
276 100,276 100,
277 "expansion-size-factor", 1.0f);277 "expansion-size-factor", 1.0f);