From 4a613dbe803b39c1421543924b21fb43dfb682dc Mon Sep 17 00:00:00 2001 From: Andrea Azzarone Date: Tue, 20 May 2014 16:32:58 +0200 Subject: Remove cross fade effect during lock/unlocking. A simple fading works just fine. Fixes LP: #1312107 (bzr r3806.9.1) --- plugins/unityshell/src/unityshell.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'plugins/unityshell') diff --git a/plugins/unityshell/src/unityshell.cpp b/plugins/unityshell/src/unityshell.cpp index 283275e6b..b339e6e7b 100644 --- a/plugins/unityshell/src/unityshell.cpp +++ b/plugins/unityshell/src/unityshell.cpp @@ -2906,7 +2906,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()) { @@ -2914,7 +2914,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); -- cgit v1.2.3