diff options
| author | Andrea Azzarone <azzaronea@gmail.com> | 2014-06-19 18:41:07 +0000 |
|---|---|---|
| committer | CI bot <ps-jenkins@lists.canonical.com> | 2014-06-19 18:41:07 +0000 |
| commit | 6fbbee7d07b77d4aa2b3cfb902d5811a058f16e9 (patch) | |
| tree | 02d96708f89c476150f9217d03810d8cddb18983 /plugins/unityshell | |
| parent | e90a2d21cc263b0fa3410015bffe6cc865a67fce (diff) | |
| parent | 4a613dbe803b39c1421543924b21fb43dfb682dc (diff) | |
Remove cross fade effect during lock/unlocking. A simple fading works just fine. Fixes: 1312107
(bzr r3826)
Diffstat (limited to 'plugins/unityshell')
| -rw-r--r-- | plugins/unityshell/src/unityshell.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/plugins/unityshell/src/unityshell.cpp b/plugins/unityshell/src/unityshell.cpp index ea1a12c96..1f2d0661c 100644 --- a/plugins/unityshell/src/unityshell.cpp +++ b/plugins/unityshell/src/unityshell.cpp @@ -2895,7 +2895,7 @@ bool UnityWindow::glPaint(const GLWindowPaintAttrib& attrib, GLWindowPaintAttrib wAttrib = attrib; - if (uScreen->lockscreen_controller_->IsLocked()) + if (uScreen->lockscreen_controller_->IsLocked() && uScreen->lockscreen_controller_->opacity() == 1.0) { if (!window->minimized() && !CanBypassLockScreen()) { @@ -2903,7 +2903,7 @@ bool UnityWindow::glPaint(const GLWindowPaintAttrib& attrib, // (well, it works too much, as it applies to menus too), so we need // to paint the windows at the proper opacity, overriding any other // paint plugin (animation, fade?) that might interfere with us. - wAttrib.opacity = COMPIZ_COMPOSITE_OPAQUE * (1.0f - uScreen->lockscreen_controller_->opacity()); + wAttrib.opacity = 0.0; int old_index = gWindow->glPaintGetCurrentIndex(); gWindow->glPaintSetCurrentIndex(MAXSHORT); bool ret = gWindow->glPaint(wAttrib, matrix, region, mask); |