Merge lp:~townsend/unity/fix-lp1104236 into lp:unity

[Christopher Townsend]

Fix issue where windows that are in Show Desktop mode are selected for spread have a blank preview. This fix will Fade Out the window for Spread and Fade In the window again when Spread exits if that window is not chosen.

Fix issue where windows that are in Show Desktop mode are selected for spread have a blank preview. This fix will Fade Out the window for Spread and Fade In the window again when Spread exits if that window is not chosen.

This also needs https://code.launchpad.net/~townsend/compiz/fix-lp1104236 in Compiz to get a good fade out effect when leaving Spread.

[Brandon Schaefer (brandontschaefer)]

LGTM

review: Approve

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:3755
http://jenkins.qa.ubuntu.com/job/unity-ci/852/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-trusty-amd64-ci/388
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-trusty-armhf-ci/384
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-trusty-i386-ci/386

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

review: Approve (continuous-integration)

=== modified file 'plugins/unityshell/src/unityshell.cpp'
--- plugins/unityshell/src/unityshell.cpp	2014-04-03 11:10:13 +0000
+++ plugins/unityshell/src/unityshell.cpp	2014-04-04 14:51:42 +0000
@@ -4286,12 +4286,35 @@
   close_icon_state_ = decoration::WidgetState::NORMAL;
   middle_clicked_ = false;
   deco_win_->scaled = true;
+
+  if (IsInShowdesktopMode())
+  {
+    if (mShowdesktopHandler)
+    {
+      mShowdesktopHandler->FadeIn();
+    }
+  }
 }
 
 void UnityWindow::OnTerminateSpread()
 {
   CleanupCachedTextures();
   deco_win_->scaled = false;
+
+  if (IsInShowdesktopMode())
+  {
+    if (!(screen->activeWindow() == window->id()))
+    {
+      if (!mShowdesktopHandler)
+        mShowdesktopHandler.reset(new ShowdesktopHandler(static_cast <ShowdesktopHandlerWindowInterface *>(this),
+                                                         static_cast <compiz::WindowInputRemoverLockAcquireInterface *>(this)));
+      mShowdesktopHandler->FadeOut();
+    }
+    else
+    {
+      window->setShowDesktopMode (false);
+    }
+  }
 }
 
 void UnityWindow::paintInnerGlow(nux::Geometry glow_geo, GLMatrix const& matrix, GLWindowPaintAttrib const& attrib, unsigned mask)