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

Proposed by Mirco Müller on 2010-09-13
Status: Merged
Approved by: Mirco Müller on 2010-09-13
Approved revision: 496
Merged at revision: 495
Proposed branch: lp:~unity-team/unity/unity.fix-631446
Merge into: lp:unity
Diff against target: 21 lines (+2/-2)
1 file modified
unity-private/launcher/quicklist-controller.vala (+2/-2)
To merge this branch: bzr merge lp:~unity-team/unity/unity.fix-631446
Reviewer Review Type Date Requested Status
David Barth (community) 2010-09-13 Approve on 2010-09-13
Review via email: mp+35263@code.launchpad.net

Description of the change

This fixes the jumping of the quicklist (when expanding from the tooltip) and aligns the anchor-arrow tip with the triangle/arrow indicating the focused application. Fixes LP: #631446.

To post a comment you must log in.
David Barth (dbarth) wrote :

+1 the code change is safe. Go ahead and merge it on trunk so that Design can also confirm the change is correct with the daily builds

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-08-26 09:31:34 +0000
+++ unity-private/launcher/quicklist-controller.vala 2010-09-13 10:19:47 +0000
@@ -186,7 +186,7 @@
186 h = (attached_controller.child as Ctk.Actor).get_height();186 h = (attached_controller.child as Ctk.Actor).get_height();
187 menu.compute_style_textures ();187 menu.compute_style_textures ();
188 menu.set_expansion_size_factor (0.0f);188 menu.set_expansion_size_factor (0.0f);
189 menu.set_anchor_position (x + w-6, y + h/2.0f, 0);189 menu.set_anchor_position (x + w - 4, y + h/2.0f, 0);
190 }190 }
191 else if (state == QuicklistControllerState.MENU)191 else if (state == QuicklistControllerState.MENU)
192 {192 {
@@ -255,7 +255,7 @@
255 h = (attached_controller.child as Ctk.Actor).get_height();255 h = (attached_controller.child as Ctk.Actor).get_height();
256 menu.compute_style_textures ();256 menu.compute_style_textures ();
257 menu.set_expansion_size_factor (0.0f);257 menu.set_expansion_size_factor (0.0f);
258 menu.set_anchor_position (x + w-6, y + h/2.0f, 0);258 menu.set_anchor_position (x + w - 9, y + h/2.0f, 0);
259 menu.animate (Clutter.AnimationMode.LINEAR,259 menu.animate (Clutter.AnimationMode.LINEAR,
260 100,260 100,
261 "expansion-size-factor", 1.0f);261 "expansion-size-factor", 1.0f);