Merge lp:~mterry/unity-greeter/986967 into lp:unity-greeter

Proposed by Michael Terry on 2012-05-03
Status: Merged
Merged at revision: 455
Proposed branch: lp:~mterry/unity-greeter/986967
Merge into: lp:unity-greeter
Diff against target: 10 lines (+1/-0) 1 file modified
To merge this branch: bzr merge lp:~mterry/unity-greeter/986967
Reviewer Review Type Date Requested Status
Robert Ancell Approve on 2012-05-03
Ken VanDine 2012-05-03 Pending
Review via email: mp+104622@code.launchpad.net

Description of the Change

So bug 986967 seems to be caused by the background alpha being stuck at 0.0 instead of driving toward 1.0. We wait for the background to finish fading in before logging the user in, because we want a smooth transition to the session.

However, imagine the following sequence:
1) The background is currently the default.
2) We start loading a new background, setting the alpha to 0.0 and starting the animation
3) It shortly fails to load, so we go back to the old background, which stops the timer.
4) When drawing again, we see that now the old background and the new background are the same, so we don't restart the timer.

So the quickest fix is to make sure that whenever we stop the timer, we 'fast-forward' the alpha to 1.0 again. That's done here.

To post a comment you must log in.
review: Approve
Tom Dimiduk (tdimiduk) wrote :

I had bug 986967 and the ppa version of this patch fixed it.

Preview Diff

1=== modified file 'src/background.vala'
2--- src/background.vala 2012-04-16 08:33:55 +0000
3+++ src/background.vala 2012-05-03 20:52:18 +0000
4@@ -433,6 +433,7 @@
5 {
6 old = current;
7 current = new_background;
8+ alpha = 1.0; /* if the timer isn't going, we should always be at 1.0 */
9 timer.stop ();
10 }
11

Subscribers

People subscribed via source and target branches