Merge lp:~mc-return/compiz/compiz.merge-fix875311-expo-fadeandzoom-and-vortex-animations-black-screen into lp:compiz/0.9.9

[MC Return]

Expo: Fixed "Fade+Zoom" and "Vortex" animations resulting in a black screen.
(LP: #875311)

[Daniel van Vugt (vanvugt)]

I can't seem to reproduce the bug now. It looks almost the same with and without the fix so someone else should test this to verify it.

There's a weird problem with window decorations not fading out (not honouring PAINT_WINDOW_TRANSLUCENT_MASK). But that's not related to this bug directly and is probably bug 1028809.

review: Abstain

[MC Return (mc-return)]

> I can't seem to reproduce the bug now. It looks almost the same with and
> without the fix so someone else should test this to verify it.
>

You have to make sure CCSM->Expo->Behaviour tab->"Hide panels/docks in expo" is disabled (which is the default setting) and you have some windows opened to be able to reproduce the wrongly finishing Fade+Zoom and Vortex animations.

> There's a weird problem with window decorations not fading out (not honouring
> PAINT_WINDOW_TRANSLUCENT_MASK). But that's not related to this bug directly
> and is probably bug 1028809.

Yeah, I noticed that also (slower/strange fade-out of window decorations here), but thought it might happen with Emerald only...

[Daniel van Vugt (vanvugt)]

Weird I still can't reproduce this on my desktop. But the proposal doesn't seem to break anything (other than performance, in theory).

review: Approve

=== modified file 'plugins/expo/src/expo.cpp'
--- plugins/expo/src/expo.cpp	2012-09-24 11:32:27 +0000
+++ plugins/expo/src/expo.cpp	2012-11-02 17:56:21 +0000
@@ -1411,12 +1411,7 @@
 	           (window->wmType () & CompWindowTypeDockMask);
 
 	if (eScreen->expoCam > 0.0)
-	{
-	    if (eScreen->expoCam < 1.0 && !zoomAnim)
-		mask |= PAINT_WINDOW_TRANSLUCENT_MASK;
-	    else if (hide)
-		mask |= PAINT_WINDOW_TRANSLUCENT_MASK;
-	}
+	    mask |= PAINT_WINDOW_TRANSLUCENT_MASK;
 
 	if (!zoomAnim)
 	    opacity = attrib.opacity * eScreen->expoCam;