Unity

Merge lp:~azzar1/unity/fix-1312107 into lp:unity

  1. fix-1312107
  2. Merge into trunk
Proposed by Andrea Azzarone
Status: Merged
Approved by: Marco Trevisan (Treviño)
Approved revision: no longer in the source branch.
Merged at revision: 3826
Proposed branch: lp:~azzar1/unity/fix-1312107
Merge into: lp:unity
Diff against target: 21 lines (+2/-2)
1 file modified
plugins/unityshell/src/unityshell.cpp (+2/-2)
To merge this branch: bzr merge lp:~azzar1/unity/fix-1312107
Reviewer Review Type Date Requested Status
Marco Trevisan (Treviño) Approve
PS Jenkins bot (community) continuous-integration Approve
Review via email: mp+220277@code.launchpad.net

Commit message

Remove cross fade effect during lock/unlocking. A simple fading works just fine.

Description of the change

Cross fade effect is pretty buggy. Let's just use a simple fading.

To post a comment you must log in.
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

PASSED: Continuous integration, rev:3807
http://jenkins.qa.ubuntu.com/job/unity-ci/930/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-utopic-amd64-ci/17
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-utopic-armhf-ci/17
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-utopic-i386-ci/17

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-ci/930/rebuild

review: Approve (continuous-integration)
Revision history for this message
Marco Trevisan (Treviño) (3v1n0) wrote :

Sad approve :/

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'plugins/unityshell/src/unityshell.cpp'
2--- plugins/unityshell/src/unityshell.cpp 2014-05-12 22:01:39 +0000
3+++ plugins/unityshell/src/unityshell.cpp 2014-05-20 14:34:23 +0000
4@@ -2906,7 +2906,7 @@
5
6 GLWindowPaintAttrib wAttrib = attrib;
7
8- if (uScreen->lockscreen_controller_->IsLocked())
9+ if (uScreen->lockscreen_controller_->IsLocked() && uScreen->lockscreen_controller_->opacity() == 1.0)
10 {
11 if (!window->minimized() && !CanBypassLockScreen())
12 {
13@@ -2914,7 +2914,7 @@
14 // (well, it works too much, as it applies to menus too), so we need
15 // to paint the windows at the proper opacity, overriding any other
16 // paint plugin (animation, fade?) that might interfere with us.
17- wAttrib.opacity = COMPIZ_COMPOSITE_OPAQUE * (1.0f - uScreen->lockscreen_controller_->opacity());
18+ wAttrib.opacity = 0.0;
19 int old_index = gWindow->glPaintGetCurrentIndex();
20 gWindow->glPaintSetCurrentIndex(MAXSHORT);
21 bool ret = gWindow->glPaint(wAttrib, matrix, region, mask);