Merge lp:~azzar1/unity/lp-1485073 into lp:unity

[Andrea Azzarone]

Properly hide decorations when on "Show Desktop" mode.

The all point of DoOverrideFrameRegion is to short circuit the frame region update func and ensure that the frame does not have a region. So we should not call deco_win->... there.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:3984
http://jenkins.qa.ubuntu.com/job/unity-ci/1282/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-wily-amd64-ci/60/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-wily-armhf-ci/58/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-wily-i386-ci/58/console

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

review: Needs Fixing (continuous-integration)

[Marco Trevisan (Treviño) (3v1n0)]

+1

review: Approve

=== modified file 'plugins/unityshell/src/unityshell.cpp'
--- plugins/unityshell/src/unityshell.cpp	2015-05-22 13:20:44 +0000
+++ plugins/unityshell/src/unityshell.cpp	2015-08-14 18:14:08 +0000
@@ -1255,7 +1255,6 @@
 
   window->updateFrameRegionSetCurrentIndex(MAXSHORT);
   window->updateFrameRegion(region);
-  deco_win_->UpdateFrameRegion(region);
   window->updateFrameRegionSetCurrentIndex(oldUpdateFrameRegionIndex);
 }
 

=== modified file 'unity-shared/CompizUtils.cpp'
--- unity-shared/CompizUtils.cpp	2014-10-22 13:58:46 +0000
+++ unity-shared/CompizUtils.cpp	2015-08-14 18:14:08 +0000
@@ -190,9 +190,6 @@
   if (win->wmType() & (CompWindowTypeDockMask | CompWindowTypeDesktopMask))
     return elements;
 
-  if (win->inShowDesktopMode())
-    return elements;
-
   auto const& region = win->region();
   bool rectangular = (region.numRects() == 1);
   bool alpha = win->alpha();