Merge lp:~townsend/compiz/fix-lp1104236 into lp:compiz/0.9.11

[Christopher Townsend]

Only fade in and fade out a window when it's hidden if it's not in Show Desktop mode. This allows for a good fade out effect in Unity when exiting Spread while in Show Desktop mode.

Only fade in and fade out a window when it's hidden if it's not in Show Desktop mode. This allows for a good fade out effect in Unity when exiting Spread while in Show Desktop mode.

This goes along with https://code.launchpad.net/~townsend/unity/fix-lp1104236 for the complete solution.

[Brandon Schaefer (brandontschaefer)]

LGTM

review: Approve

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:3847
http://jenkins.qa.ubuntu.com/job/compiz-0.9.11-ci/53/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/compiz-0.9.11-trusty-amd64-ci/53
    SUCCESS: http://jenkins.qa.ubuntu.com/job/compiz-0.9.11-trusty-armhf-ci/53
    SUCCESS: http://jenkins.qa.ubuntu.com/job/compiz-0.9.11-trusty-i386-ci/53

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/compiz-0.9.11-ci/53/rebuild

review: Approve (continuous-integration)

=== modified file 'plugins/scale/src/scale.cpp'
--- plugins/scale/src/scale.cpp	2014-03-04 14:30:25 +0000
+++ plugins/scale/src/scale.cpp	2014-04-04 14:52:55 +0000
@@ -260,7 +260,8 @@
     /* Windows that wouldn't be visible before and after entering
      * scale mode (because some plugin modified CompWindow::focus)
      * should be faded in and out */
-    if (window->state () & CompWindowStateHiddenMask)
+    if (window->state () & CompWindowStateHiddenMask &&
+	!window->inShowDesktopMode ())
     {
 	GLfloat factor = 0;
 	GLfloat targetX, targetY, targetScale;